[Nagios-checkins] SF.net SVN: nagios:[1906] nagioscore/trunk/base/checks.c
Nagios network monitoring software is enterprise server monitoring
Brought to you by:
egalstad,
sawolf-nagios
From: <ag...@us...> - 2012-02-07 10:20:21
|
Revision: 1906 http://nagios.svn.sourceforge.net/nagios/?rev=1906&view=rev Author: ageric Date: 2012-02-07 10:20:10 +0000 (Tue, 07 Feb 2012) Log Message: ----------- check core: Fix thinko in last patch The raw_command thing is apparently debug-logged in one place, but not in others. We special-case that place with an extra my_free() call to avoid read-from-null coredumps. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/base/checks.c Modified: nagioscore/trunk/base/checks.c =================================================================== --- nagioscore/trunk/base/checks.c 2012-02-07 10:15:02 UTC (rev 1905) +++ nagioscore/trunk/base/checks.c 2012-02-07 10:20:10 UTC (rev 1906) @@ -2757,8 +2757,8 @@ /* process any macros contained in the argument */ process_macros_r(&mac, raw_command, &processed_command, 0); - my_free(raw_command); if(processed_command == NULL) { + my_free(raw_command); clear_volatile_macros_r(&mac); return ERROR; } @@ -2772,6 +2772,7 @@ log_debug_info(DEBUGL_COMMANDS, 1, "Raw host check command: %s\n", raw_command); log_debug_info(DEBUGL_COMMANDS, 0, "Processed host check ommand: %s\n", processed_command); + my_free(raw_command); /* clear plugin output and performance data buffers */ my_free(hst->plugin_output); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |