From: <ag...@us...> - 2012-09-05 10:55:52
|
Revision: 2151 http://nagios.svn.sourceforge.net/nagios/?rev=2151&view=rev Author: ageric Date: 2012-09-05 10:55:41 +0000 (Wed, 05 Sep 2012) Log Message: ----------- common/macros: Return a nul string for empty host and servicegroups Contactgroups seem to be handled differently, so perhaps they don't matter. This fixes issue 358, although not in the way the reporter suggested. Signed-off-by: Andreas Ericsson <ae...@op...> Modified Paths: -------------- nagioscore/trunk/common/macros.c Modified: nagioscore/trunk/common/macros.c =================================================================== --- nagioscore/trunk/common/macros.c 2012-09-05 10:43:25 UTC (rev 2150) +++ nagioscore/trunk/common/macros.c 2012-09-05 10:55:41 UTC (rev 2151) @@ -1878,6 +1878,12 @@ temp_len += strlen(temp_hostsmember->host_name) + 2; } } + if(!temp_len) { + /* empty group, so return the nul string */ + *output = calloc(1, 1); + return OK; + } + /* allocate or reallocate the memory buffer */ if(*output == NULL) { *output = (char *)malloc(temp_len); @@ -2214,6 +2220,11 @@ temp_len += strlen(temp_servicesmember->host_name) + strlen(temp_servicesmember->service_description) + 3; } } + if(!temp_len) { + /* empty group, so return the nul string */ + *output = calloc(1, 1); + return OK; + } /* allocate or reallocate the memory buffer */ if(*output == NULL) { *output = (char *)malloc(temp_len); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |