tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-24 06:15:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

2011-08-19 Ramon Novoa <rnovoa@artica.es>

Browse Source 
* modules/pandora_module_plugin.cc: Set a virtually infinite timeout
	  for plugins.

	* pandora_windows_service.cc: The Pandora_Windows_Service destructor
	  could try to dereference a NULL pointer. Fixed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4782 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2011-08-19 11:58:22 +00:00
parent 0003c28fcd
commit ff10bac9fb
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_agents/win32/ChangeLog
View File

@ -1,3 +1,11 @@
2011-08-19 Ramon Novoa <rnovoa@artica.es>
* modules/pandora_module_plugin.cc: Set a virtually infinite timeout
for plugins.
* pandora_windows_service.cc: The Pandora_Windows_Service destructor
could try to dereference a NULL pointer. Fixed.
2011-07-29 Dario Rodriguez <dario.rodriguez@artica.es> 2011-07-29 Dario Rodriguez <dario.rodriguez@artica.es>
* bin/PandoraAgent.exe: Compiled new exe with a bug fixed. * bin/PandoraAgent.exe: Compiled new exe with a bug fixed.

4
pandora_agents/win32/modules/pandora_module_plugin.cc
View File

@ -19,7 +19,8 @@
#include "pandora_module_plugin.h" #include "pandora_module_plugin.h"
#include "../pandora_strutils.h" #include "../pandora_strutils.h"
#include <windows.h> #include <windows.h>
#include <limits.h>
using namespace Pandora; using namespace Pandora;
using namespace Pandora_Strutils; using namespace Pandora_Strutils;
@ -34,6 +35,7 @@ using namespace Pandora_Modules;
Pandora_Module_Plugin::Pandora_Module_Plugin (string name, string plugin) Pandora_Module_Plugin::Pandora_Module_Plugin (string name, string plugin)
: Pandora_Module_Exec ("plugin", plugin) { : Pandora_Module_Exec ("plugin", plugin) {
this->setKind (module_plugin_str); this->setKind (module_plugin_str);
this->setTimeout (INT_MAX);
} }
/** /**

7
pandora_agents/win32/pandora_windows_service.cc
View File

@ -83,11 +83,10 @@ Pandora_Windows_Service::setValues (const char * svc_name,
*/ */
Pandora_Windows_Service::~Pandora_Windows_Service () { Pandora_Windows_Service::~Pandora_Windows_Service () {
if(conf->getValue("proxy_mode") != "") {
killTentacleProxy();
}
if (this->conf != NULL) { if (this->conf != NULL) {
if(conf->getValue("proxy_mode") != "") {
killTentacleProxy();
}
delete this->conf; delete this->conf;
} }