File nagios-3.2.1-fix_compiler_warnings.patch of Package nagios

Overview Repositories Revisions Requests Users Attributes Meta

File nagios-3.2.1-fix_compiler_warnings.patch of Package nagios (Revision a578b90279184a06cc2aaa77356e477c)

Currently displaying revision a578b90279184a06cc2aaa77356e477c , Show latest

Index: cgi/cmd.c
===================================================================
--- cgi/cmd.c.orig
+++ cgi/cmd.c
@@ -1925,7 +1925,6 @@ static int cmd_submitf(int id, const cha
 
 /* commits a command for processing */
 int commit_command(int cmd){
-	char command_buffer[MAX_INPUT_BUFFER];
 	time_t current_time;
 	time_t scheduled_time;
 	time_t notification_time;
Index: cgi/extinfo.c
===================================================================
--- cgi/extinfo.c.orig
+++ cgi/extinfo.c
@@ -1116,7 +1116,9 @@ void show_host_info(void){
 		printf("<TR><TD CLASS='dataVar' VALIGN='top'>Status Information:</td><td CLASS='dataVal'>%s",(temp_hoststatus->plugin_output==NULL)?"":html_encode(temp_hoststatus->plugin_output,TRUE));
 		if(enable_splunk_integration==TRUE){
 			printf("&nbsp;&nbsp;");
-			asprintf(&buf,"%s %s",temp_host->name,temp_hoststatus->plugin_output);
+			if (asprintf(&buf,"%s %s",temp_host->name,temp_hoststatus->plugin_output) == -1){
+				fprintf(stderr,"Failed to allocate string for host and hoststatus\n");
+			}
 			display_splunk_generic_url(buf,1);
 			free(buf);
 			}
@@ -1433,7 +1435,9 @@ void show_service_info(void){
 		printf("<TR><TD CLASS='dataVar' VALIGN='top'>Status Information:</TD><TD CLASS='dataVal'>%s",(temp_svcstatus->plugin_output==NULL)?"":html_encode(temp_svcstatus->plugin_output,TRUE));
 		if(enable_splunk_integration==TRUE){
 			printf("&nbsp;&nbsp;");
-			asprintf(&buf,"%s %s %s",temp_service->host_name,temp_service->description,temp_svcstatus->plugin_output);
+			if (asprintf(&buf,"%s %s %s",temp_service->host_name,temp_service->description,temp_svcstatus->plugin_output) == -1){
+				fprintf(stderr,"Failed to allocate string for plugin output\n");
+			}
 			display_splunk_generic_url(buf,1);
 			free(buf);
 			}
Index: cgi/statuswml.c
===================================================================
--- cgi/statuswml.c.orig
+++ cgi/statuswml.c
@@ -1291,7 +1291,8 @@ void display_ping(void){
 			fp=popen(buffer,"r");
 			if(fp){
 				while(1){
-					fgets(buffer,sizeof(buffer)-1,fp);
+					if (!fgets(buffer,sizeof(buffer)-1,fp))
+						break;
 					if(feof(fp))
 						break;
 
@@ -1360,7 +1361,8 @@ void display_traceroute(void){
 		fp=popen(buffer,"r");
 		if(fp){
 			while(1){
-				fgets(buffer,sizeof(buffer)-1,fp);
+				if(!fgets(buffer,sizeof(buffer)-1,fp))
+					break;
 				if(feof(fp))
 					break;
 
Index: common/macros.c
===================================================================
--- common/macros.c.orig
+++ common/macros.c
@@ -1232,22 +1232,38 @@ int grab_macrox_value(int macro_type, ch
 			/* these macros are time-intensive to compute, and will likely be used together, so save them all for future use */
 			for(x=MACRO_TOTALHOSTSUP;x<=MACRO_TOTALSERVICEPROBLEMSUNHANDLED;x++)
 				my_free(macro_x[x]);
-			asprintf(&macro_x[MACRO_TOTALHOSTSUP],"%d",hosts_up);
-			asprintf(&macro_x[MACRO_TOTALHOSTSDOWN],"%d",hosts_down);
-			asprintf(&macro_x[MACRO_TOTALHOSTSUNREACHABLE],"%d",hosts_unreachable);
-			asprintf(&macro_x[MACRO_TOTALHOSTSDOWNUNHANDLED],"%d",hosts_down_unhandled);
-			asprintf(&macro_x[MACRO_TOTALHOSTSUNREACHABLEUNHANDLED],"%d",hosts_unreachable_unhandled);
-			asprintf(&macro_x[MACRO_TOTALHOSTPROBLEMS],"%d",host_problems);
-			asprintf(&macro_x[MACRO_TOTALHOSTPROBLEMSUNHANDLED],"%d",host_problems_unhandled);
-			asprintf(&macro_x[MACRO_TOTALSERVICESOK],"%d",services_ok);
-			asprintf(&macro_x[MACRO_TOTALSERVICESWARNING],"%d",services_warning);
-			asprintf(&macro_x[MACRO_TOTALSERVICESCRITICAL],"%d",services_critical);
-			asprintf(&macro_x[MACRO_TOTALSERVICESUNKNOWN],"%d",services_unknown);
-			asprintf(&macro_x[MACRO_TOTALSERVICESWARNINGUNHANDLED],"%d",services_warning_unhandled);
-			asprintf(&macro_x[MACRO_TOTALSERVICESCRITICALUNHANDLED],"%d",services_critical_unhandled);
-			asprintf(&macro_x[MACRO_TOTALSERVICESUNKNOWNUNHANDLED],"%d",services_unknown_unhandled);
-			asprintf(&macro_x[MACRO_TOTALSERVICEPROBLEMS],"%d",service_problems);
-			asprintf(&macro_x[MACRO_TOTALSERVICEPROBLEMSUNHANDLED],"%d",service_problems_unhandled);
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSUP],"%d",hosts_up) == -1)
+				fprintf(stderr,"Failed to allocate string for total hosts up\n");
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSDOWN],"%d",hosts_down) == -1)
+				fprintf(stderr,"Failed to allocate string for total hosts down\n");
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSUNREACHABLE],"%d",hosts_unreachable) == -1)
+				fprintf(stderr,"Failed to allocate string for total hosts unreachable\n");
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSDOWNUNHANDLED],"%d",hosts_down_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total hosts unhandled\n");
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSUNREACHABLEUNHANDLED],"%d",hosts_unreachable_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total hosts unreachable unhandled\n");
+			if (asprintf(&macro_x[MACRO_TOTALHOSTPROBLEMS],"%d",host_problems) == -1)
+				fprintf(stderr,"Failed to allocate string for total host problems\n");
+			if (asprintf(&macro_x[MACRO_TOTALHOSTPROBLEMSUNHANDLED],"%d",host_problems_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total hosts problems unhandled\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESOK],"%d",services_ok) == -1)
+				fprintf(stderr,"Failed to allocate string for total services ok\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESWARNING],"%d",services_warning) == -1)
+				fprintf(stderr,"Failed to allocate string for total services warning\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESCRITICAL],"%d",services_critical) == -1)
+				fprintf(stderr,"Failed to allocate string for total services critical\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESUNKNOWN],"%d",services_unknown) == -1)
+				fprintf(stderr,"Failed to allocate string for total services unknown\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESWARNINGUNHANDLED],"%d",services_warning_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total services warning unhandled\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESCRITICALUNHANDLED],"%d",services_critical_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total services critical unhandled\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICESUNKNOWNUNHANDLED],"%d",services_unknown_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total services unknown unhandled\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICEPROBLEMS],"%d",service_problems) == -1)
+				fprintf(stderr,"Failed to allocate string for total service problems\n");
+			if (asprintf(&macro_x[MACRO_TOTALSERVICEPROBLEMSUNHANDLED],"%d",service_problems_unhandled) == -1)
+				fprintf(stderr,"Failed to allocate string for total service problems unhandled\n");
 			}
 
 		/* return only the macro the user requested */
@@ -1547,19 +1563,22 @@ int grab_datetime_macro(int macro_type,
 		break;
 
 	case MACRO_TIMET:
-		asprintf(output,"%lu",(unsigned long)current_time);
+		if (asprintf(output,"%lu",(unsigned long)current_time) == -1)
+			fprintf(stderr,"Failed to allocate string for macro current time\n");
 		break;
 
 #ifdef NSCORE
 	case MACRO_ISVALIDTIME:
-		asprintf(output,"%d",(check_time_against_period(test_time,temp_timeperiod)==OK)?1:0);
+		if (asprintf(output,"%d",(check_time_against_period(test_time,temp_timeperiod)==OK)?1:0) == -1)
+			fprintf(stderr,"Failed to allocate string for check time against period output\n");
 		break;
 
 	case MACRO_NEXTVALIDTIME:
 		get_next_valid_time(test_time,&next_valid_time,temp_timeperiod);
 		if(next_valid_time==test_time && check_time_against_period(test_time,temp_timeperiod)==ERROR)
 			next_valid_time=(time_t)0L;
-		asprintf(output,"%lu",(unsigned long)next_valid_time);
+		if (asprintf(output,"%lu",(unsigned long)next_valid_time) == -1)
+			fprintf(stderr,"Failed to allocate string for next valid time output\n");
 		break;
 #endif
 
@@ -1628,7 +1647,8 @@ int grab_standard_host_macro(int macro_t
 			*output=(char *)strdup("UP");
 		break;
 	case MACRO_HOSTSTATEID:
-		asprintf(output,"%d",temp_host->current_state);
+		if (asprintf(output,"%d",temp_host->current_state) == -1)
+			fprintf(stderr,"Failed to allocate string for host state id output\n");
 		break;
 	case MACRO_LASTHOSTSTATE:
 		if(temp_host->last_state==HOST_DOWN)
@@ -1639,13 +1659,16 @@ int grab_standard_host_macro(int macro_t
 			*output=(char *)strdup("UP");
 		break;
 	case MACRO_LASTHOSTSTATEID:
-		asprintf(output,"%d",temp_host->last_state);
+		if (asprintf(output,"%d",temp_host->last_state) == -1)
+			fprintf(stderr,"Failed to allocate string for host last state output\n");
 		break;
 	case MACRO_HOSTCHECKTYPE:
-		asprintf(output,"%s",(temp_host->check_type==HOST_CHECK_PASSIVE)?"PASSIVE":"ACTIVE");
+		if (asprintf(output,"%s",(temp_host->check_type==HOST_CHECK_PASSIVE)?"PASSIVE":"ACTIVE") == -1)
+			fprintf(stderr,"Failed to allocate string for host check type output\n");
 		break;
 	case MACRO_HOSTSTATETYPE:
-		asprintf(output,"%s",(temp_host->state_type==HARD_STATE)?"HARD":"SOFT");
+		if (asprintf(output,"%s",(temp_host->state_type==HARD_STATE)?"HARD":"SOFT") == -1)
+			fprintf(stderr,"Failed to allocate string for host state type output\n");
 		break;
 	case MACRO_HOSTOUTPUT:
 		if(temp_host->plugin_output)
@@ -1666,16 +1689,20 @@ int grab_standard_host_macro(int macro_t
 		break;
 #ifdef NSCORE
 	case MACRO_HOSTATTEMPT:
-		asprintf(output,"%d",temp_host->current_attempt);
+		if (asprintf(output,"%d",temp_host->current_attempt) == -1)
+			fprintf(stderr,"Failed to allocate string for host attempt output\n");
 		break;
 	case MACRO_MAXHOSTATTEMPTS:
-		asprintf(output,"%d",temp_host->max_attempts);
+		if (asprintf(output,"%d",temp_host->max_attempts) == -1)
+			fprintf(stderr,"Failed to allocate string for max host attempts output\n");
 		break;
 	case MACRO_HOSTDOWNTIME:
-		asprintf(output,"%d",temp_host->scheduled_downtime_depth);
+		if (asprintf(output,"%d",temp_host->scheduled_downtime_depth) == -1)
+			fprintf(stderr,"Failed to allocate string for scheduled host downtime output\n");
 		break;
 	case MACRO_HOSTPERCENTCHANGE:
-		asprintf(output,"%.2f",temp_host->percent_state_change);
+		if (asprintf(output,"%.2f",temp_host->percent_state_change) == -1)
+			fprintf(stderr,"Failed to allocate string for host percent state change output\n");
 		break;
 	case MACRO_HOSTDURATIONSEC:
 	case MACRO_HOSTDURATION:
@@ -1683,7 +1710,8 @@ int grab_standard_host_macro(int macro_t
 		duration=(unsigned long)(current_time-temp_host->last_state_change);
 
 		if(macro_type==MACRO_HOSTDURATIONSEC)
-			asprintf(output,"%lu",duration);
+			if (asprintf(output,"%lu",duration) == -1)
+				fprintf(stderr,"Failed to allocate string for host duration in seconds\n");
 		else{
 
 			days=duration/86400;
@@ -1693,47 +1721,61 @@ int grab_standard_host_macro(int macro_t
 			minutes=duration/60;
 			duration-=(minutes*60);
 			seconds=duration;
-			asprintf(output,"%dd %dh %dm %ds",days,hours,minutes,seconds);
+			if (asprintf(output,"%dd %dh %dm %ds",days,hours,minutes,seconds) == -1)
+				fprintf(stderr,"Failed to allocate string for host duration output\n");
 			}
 		break;
 	case MACRO_HOSTEXECUTIONTIME:
-		asprintf(output,"%.3f",temp_host->execution_time);
+		if (asprintf(output,"%.3f",temp_host->execution_time) == -1)
+			fprintf(stderr,"Failed to allocate string for host execution time\n");
 		break;
 	case MACRO_HOSTLATENCY:
-		asprintf(output,"%.3f",temp_host->latency);
+		if (asprintf(output,"%.3f",temp_host->latency) == -1)
+			fprintf(stderr,"Failed to allocate string for host latency\n");
 		break;
 	case MACRO_LASTHOSTCHECK:
-		asprintf(output,"%lu",(unsigned long)temp_host->last_check);
+		if (asprintf(output,"%lu",(unsigned long)temp_host->last_check) == -1)
+			fprintf(stderr,"Failed to allocate string for host last check\n");
 		break;
 	case MACRO_LASTHOSTSTATECHANGE:
-		asprintf(output,"%lu",(unsigned long)temp_host->last_state_change);
+		if (asprintf(output,"%lu",(unsigned long)temp_host->last_state_change) == -1)
+			fprintf(stderr,"Failed to allocate string for host last state change\n");
 		break;
 	case MACRO_LASTHOSTUP:
-		asprintf(output,"%lu",(unsigned long)temp_host->last_time_up);
+		if (asprintf(output,"%lu",(unsigned long)temp_host->last_time_up) == -1)
+			fprintf(stderr,"Failed to allocate string for last host uptime\n");
 		break;
 	case MACRO_LASTHOSTDOWN:
-		asprintf(output,"%lu",(unsigned long)temp_host->last_time_down);
+		if (asprintf(output,"%lu",(unsigned long)temp_host->last_time_down) == -1)
+			fprintf(stderr,"Failed to allocate string for last host downtime\n");
 		break;
 	case MACRO_LASTHOSTUNREACHABLE:
-		asprintf(output,"%lu",(unsigned long)temp_host->last_time_unreachable);
+		if (asprintf(output,"%lu",(unsigned long)temp_host->last_time_unreachable) == -1)
+			fprintf(stderr,"Failed to allocate string for last host unreachable time\n");
 		break;
 	case MACRO_HOSTNOTIFICATIONNUMBER:
-		asprintf(output,"%d",temp_host->current_notification_number);
+		if (asprintf(output,"%d",temp_host->current_notification_number) == -1)
+			fprintf(stderr,"Failed to allocate string for current host notification number\n");
 		break;
 	case MACRO_HOSTNOTIFICATIONID:
-		asprintf(output,"%lu",temp_host->current_notification_id);
+		if (asprintf(output,"%lu",temp_host->current_notification_id) == -1)
+			fprintf(stderr,"Failed to allocate string for current host notification id\n");
 		break;
 	case MACRO_HOSTEVENTID:
-		asprintf(output,"%lu",temp_host->current_event_id);
+		if (asprintf(output,"%lu",temp_host->current_event_id) == -1)
+			fprintf(stderr,"Failed to allocate string for current event id\n");
 		break;
 	case MACRO_LASTHOSTEVENTID:
-		asprintf(output,"%lu",temp_host->last_event_id);
+		if (asprintf(output,"%lu",temp_host->last_event_id) == -1)
+			fprintf(stderr,"Failed to allocate string for last event id\n");
 		break;
 	case MACRO_HOSTPROBLEMID:
-		asprintf(output,"%lu",temp_host->current_problem_id);
+		if (asprintf(output,"%lu",temp_host->current_problem_id) == -1)
+			fprintf(stderr,"Failed to allocate string for current problem id\n");
 		break;
 	case MACRO_LASTHOSTPROBLEMID:
-		asprintf(output,"%lu",temp_host->last_problem_id);
+		if (asprintf(output,"%lu",temp_host->last_problem_id) == -1)
+			fprintf(stderr,"Failed to allocate string for last problem id\n");
 		break;
 #endif
 	case MACRO_HOSTACTIONURL:
@@ -1756,7 +1798,8 @@ int grab_standard_host_macro(int macro_t
 			if((temp_hostgroup=(hostgroup *)temp_objectlist->object_ptr)==NULL)
 				continue;
 
-			asprintf(&buf1,"%s%s%s",(buf2)?buf2:"",(buf2)?",":"",temp_hostgroup->group_name);
+			if (asprintf(&buf1,"%s%s%s",(buf2)?buf2:"",(buf2)?",":"",temp_hostgroup->group_name) == -1)
+				fprintf(stderr,"Failed to allocate string for host group name\n");
 			my_free(buf2);
 			buf2=buf1;
 			}
@@ -1800,15 +1843,20 @@ int grab_standard_host_macro(int macro_t
 
 			/* these macros are time-intensive to compute, and will likely be used together, so save them all for future use */
 			my_free(macro_x[MACRO_TOTALHOSTSERVICES]);
-			asprintf(&macro_x[MACRO_TOTALHOSTSERVICES],"%d",total_host_services);
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSERVICES],"%d",total_host_services) == -1)
+				fprintf(stderr,"Failed to allocate string for total host services\n");
 			my_free(macro_x[MACRO_TOTALHOSTSERVICESOK]);
-			asprintf(&macro_x[MACRO_TOTALHOSTSERVICESOK],"%d",total_host_services_ok);
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSERVICESOK],"%d",total_host_services_ok) == -1)
+				fprintf(stderr,"Failed to allocate string for total host services ok\n");
 			my_free(macro_x[MACRO_TOTALHOSTSERVICESWARNING]);
-			asprintf(&macro_x[MACRO_TOTALHOSTSERVICESWARNING],"%d",total_host_services_warning);
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSERVICESWARNING],"%d",total_host_services_warning) == -1)
+				fprintf(stderr,"Failed to allocate string for total host services warning\n");
 			my_free(macro_x[MACRO_TOTALHOSTSERVICESUNKNOWN]);
-			asprintf(&macro_x[MACRO_TOTALHOSTSERVICESUNKNOWN],"%d",total_host_services_unknown);
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSERVICESUNKNOWN],"%d",total_host_services_unknown) == -1)
+				fprintf(stderr,"Failed to allocate string for total host services unknown\n");
 			my_free(macro_x[MACRO_TOTALHOSTSERVICESCRITICAL]);
-			asprintf(&macro_x[MACRO_TOTALHOSTSERVICESCRITICAL],"%d",total_host_services_critical);
+			if (asprintf(&macro_x[MACRO_TOTALHOSTSERVICESCRITICAL],"%d",total_host_services_critical) == -1)
+				fprintf(stderr,"Failed to allocate string for total host services critical\n");
 			}
 
 		/* return only the macro the user requested */
@@ -2002,7 +2050,8 @@ int grab_standard_service_macro(int macr
 			*output=(char *)strdup("UNKNOWN");
 		break;
 	case MACRO_SERVICESTATEID:
-		asprintf(output,"%d",temp_service->current_state);
+		if (asprintf(output,"%d",temp_service->current_state) == -1)
+			fprintf(stderr,"Failed to allocate string for service state id\n");
 		break;
 	case MACRO_LASTSERVICESTATE:
 		if(temp_service->last_state==STATE_OK)
@@ -2015,48 +2064,62 @@ int grab_standard_service_macro(int macr
 			*output=(char *)strdup("UNKNOWN");
 		break;
 	case MACRO_LASTSERVICESTATEID:
-		asprintf(output,"%d",temp_service->last_state);
+		if (asprintf(output,"%d",temp_service->last_state) == -1)
+			fprintf(stderr,"Failed to allocate string for last service state id\n");
 		break;
 #endif
 	case MACRO_SERVICEISVOLATILE:
-		asprintf(output,"%d",temp_service->is_volatile);
+		if (asprintf(output,"%d",temp_service->is_volatile) == -1)
+			fprintf(stderr,"Failed to allocate string for service is volatile\n");
 		break;
 #ifdef NSCORE
 	case MACRO_SERVICEATTEMPT:
-		asprintf(output,"%d",temp_service->current_attempt);
+		if (asprintf(output,"%d",temp_service->current_attempt) == -1)
+			fprintf(stderr,"Failed to allocate string for current attempt\n");
 		break;
 	case MACRO_MAXSERVICEATTEMPTS:
-		asprintf(output,"%d",temp_service->max_attempts);
+		if (asprintf(output,"%d",temp_service->max_attempts) == -1)
+			fprintf(stderr,"Failed to allocate string for max attempts\n");
 		break;
 	case MACRO_SERVICEEXECUTIONTIME:
-		asprintf(output,"%.3f",temp_service->execution_time);
+		if (asprintf(output,"%.3f",temp_service->execution_time) == -1)
+			fprintf(stderr,"Failed to allocate string for execution time\n");
 		break;
 	case MACRO_SERVICELATENCY:
-		asprintf(output,"%.3f",temp_service->latency);
+		if (asprintf(output,"%.3f",temp_service->latency) == -1)
+			fprintf(stderr,"Failed to allocate string for service latency\n");
 		break;
 	case MACRO_LASTSERVICECHECK:
-		asprintf(output,"%lu",(unsigned long)temp_service->last_check);
+		if (asprintf(output,"%lu",(unsigned long)temp_service->last_check) == -1)
+			fprintf(stderr,"Failed to allocate string for service last check\n");
 		break;
 	case MACRO_LASTSERVICESTATECHANGE:
-		asprintf(output,"%lu",(unsigned long)temp_service->last_state_change);
+		if (asprintf(output,"%lu",(unsigned long)temp_service->last_state_change) == -1)
+			fprintf(stderr,"Failed to allocate string for service last state change\n");
 		break;
 	case MACRO_LASTSERVICEOK:
-		asprintf(output,"%lu",(unsigned long)temp_service->last_time_ok);
+		if (asprintf(output,"%lu",(unsigned long)temp_service->last_time_ok) == -1)
+			fprintf(stderr,"Failed to allocate string for service last time ok\n");
 		break;
 	case MACRO_LASTSERVICEWARNING:
-		asprintf(output,"%lu",(unsigned long)temp_service->last_time_warning);
+		if (asprintf(output,"%lu",(unsigned long)temp_service->last_time_warning) == -1)
+			fprintf(stderr,"Failed to allocate string for service last time warning\n");
 		break;
 	case MACRO_LASTSERVICEUNKNOWN:
-		asprintf(output,"%lu",(unsigned long)temp_service->last_time_unknown);
+		if (asprintf(output,"%lu",(unsigned long)temp_service->last_time_unknown) == -1)
+			fprintf(stderr,"Failed to allocate string for service last time unknown\n");
 		break;
 	case MACRO_LASTSERVICECRITICAL:
-		asprintf(output,"%lu",(unsigned long)temp_service->last_time_critical);
+		if (asprintf(output,"%lu",(unsigned long)temp_service->last_time_critical) == -1)
+			fprintf(stderr,"Failed to allocate string for service last time critical\n");
 		break;
 	case MACRO_SERVICEDOWNTIME:
-		asprintf(output,"%d",temp_service->scheduled_downtime_depth);
+		if (asprintf(output,"%d",temp_service->scheduled_downtime_depth) == -1)
+			fprintf(stderr,"Failed to allocate string for service scheduled downtime\n");
 		break;
 	case MACRO_SERVICEPERCENTCHANGE:
-		asprintf(output,"%.2f",temp_service->percent_state_change);
+		if (asprintf(output,"%.2f",temp_service->percent_state_change) == -1)
+			fprintf(stderr,"Failed to allocate string for service percent state change\n");
 		break;
 	case MACRO_SERVICEDURATIONSEC:
 	case MACRO_SERVICEDURATION:
@@ -2066,7 +2129,8 @@ int grab_standard_service_macro(int macr
 
 		/* get the state duration in seconds */
 		if(macro_type==MACRO_SERVICEDURATIONSEC)
-			asprintf(output,"%lu",duration);
+			if (asprintf(output,"%lu",duration) == -1)
+				fprintf(stderr,"Failed to allocate string for service duration in seconds\n");
 
 		/* get the state duration */
 		else{
@@ -2077,26 +2141,33 @@ int grab_standard_service_macro(int macr
 			minutes=duration/60;
 			duration-=(minutes*60);
 			seconds=duration;
-			asprintf(output,"%dd %dh %dm %ds",days,hours,minutes,seconds);
+			if (asprintf(output,"%dd %dh %dm %ds",days,hours,minutes,seconds) == -1)
+				fprintf(stderr,"Failed to allocate string for service duration\n");
 			}
 		break;
 	case MACRO_SERVICENOTIFICATIONNUMBER:
-		asprintf(output,"%d",temp_service->current_notification_number);
+		if (asprintf(output,"%d",temp_service->current_notification_number) == -1)
+			fprintf(stderr,"Failed to allocate string for current notification number\n");
 		break;
 	case MACRO_SERVICENOTIFICATIONID:
-		asprintf(output,"%lu",temp_service->current_notification_id);
+		if (asprintf(output,"%lu",temp_service->current_notification_id) == -1)
+			fprintf(stderr,"Failed to allocate string for current notification id\n");
 		break;
 	case MACRO_SERVICEEVENTID:
-		asprintf(output,"%lu",temp_service->current_event_id);
+		if (asprintf(output,"%lu",temp_service->current_event_id) == -1)
+			fprintf(stderr,"Failed to allocate string for current event id\n");
 		break;
 	case MACRO_LASTSERVICEEVENTID:
-		asprintf(output,"%lu",temp_service->last_event_id);
+		if (asprintf(output,"%lu",temp_service->last_event_id) == -1)
+			fprintf(stderr,"Failed to allocate string for last event id\n");
 		break;
 	case MACRO_SERVICEPROBLEMID:
-		asprintf(output,"%lu",temp_service->current_problem_id);
+		if (asprintf(output,"%lu",temp_service->current_problem_id) == -1)
+			fprintf(stderr,"Failed to allocate string for current problem id\n");
 		break;
 	case MACRO_LASTSERVICEPROBLEMID:
-		asprintf(output,"%lu",temp_service->last_problem_id);
+		if (asprintf(output,"%lu",temp_service->last_problem_id) == -1)
+			fprintf(stderr,"Failed to allocate string for last problem id\n");
 		break;
 #endif
 	case MACRO_SERVICEACTIONURL:
@@ -2119,7 +2190,8 @@ int grab_standard_service_macro(int macr
 			if((temp_servicegroup=(servicegroup *)temp_objectlist->object_ptr)==NULL)
 				continue;
 
-			asprintf(&buf1,"%s%s%s",(buf2)?buf2:"",(buf2)?",":"",temp_servicegroup->group_name);
+			if (asprintf(&buf1,"%s%s%s",(buf2)?buf2:"",(buf2)?",":"",temp_servicegroup->group_name) == -1)
+				fprintf(stderr,"Failed to allocate string for service group names output\n");
 			my_free(buf2);
 			buf2=buf1;
 			}
@@ -2288,7 +2360,8 @@ int grab_standard_contact_macro(int macr
 			if((temp_contactgroup=(contactgroup *)temp_objectlist->object_ptr)==NULL)
 				continue;
 
-			asprintf(&buf1,"%s%s%s",(buf2)?buf2:"",(buf2)?",":"",temp_contactgroup->group_name);
+			if (asprintf(&buf1,"%s%s%s",(buf2)?buf2:"",(buf2)?",":"",temp_contactgroup->group_name) == -1)
+				fprintf(stderr,"Failed to allocate string for contact group name output\n");
 			my_free(buf2);
 			buf2=buf1;
 			}
@@ -3174,7 +3247,8 @@ int set_argv_macro_environment_vars(int
 
 	/* set each of the argv macro environment variables */
 	for(x=0;x<MAX_COMMAND_ARGUMENTS;x++){
-		asprintf(&macro_name,"ARG%d",x+1);
+		if (asprintf(&macro_name,"ARG%d",x+1) == -1)
+			fprintf(stderr,"Failed to allocate string for enviroment macro variable name output\n");
 		set_macro_environment_var(macro_name,macro_argv[x],set);
 		my_free(macro_name);
 	        }
@@ -3196,7 +3270,8 @@ int set_custom_macro_environment_vars(in
 	/* generate variables and save them for later */
 	if((temp_host=macro_host_ptr) && set==TRUE){
 		for(temp_customvariablesmember=temp_host->custom_variables;temp_customvariablesmember!=NULL;temp_customvariablesmember=temp_customvariablesmember->next){
-			asprintf(&customvarname,"_HOST%s",temp_customvariablesmember->variable_name);
+			if (asprintf(&customvarname,"_HOST%s",temp_customvariablesmember->variable_name) == -1)
+				fprintf(stderr,"Failed to allocate string for custom host variable name output\n");
 			add_custom_variable_to_object(&macro_custom_host_vars,customvarname,temp_customvariablesmember->variable_value);
 			my_free(customvarname);
 			}
@@ -3210,7 +3285,8 @@ int set_custom_macro_environment_vars(in
 	/* generate variables and save them for later */
 	if((temp_service=macro_service_ptr) && set==TRUE){
 		for(temp_customvariablesmember=temp_service->custom_variables;temp_customvariablesmember!=NULL;temp_customvariablesmember=temp_customvariablesmember->next){
-			asprintf(&customvarname,"_SERVICE%s",temp_customvariablesmember->variable_name);
+			if (asprintf(&customvarname,"_SERVICE%s",temp_customvariablesmember->variable_name) == -1)
+				fprintf(stderr,"Failed to allocate string for custom service variable name output\n");
 			add_custom_variable_to_object(&macro_custom_service_vars,customvarname,temp_customvariablesmember->variable_value);
 			my_free(customvarname);
 			}
@@ -3223,7 +3299,8 @@ int set_custom_macro_environment_vars(in
 	/* generate variables and save them for later */
 	if((temp_contact=macro_contact_ptr) && set==TRUE){
 		for(temp_customvariablesmember=temp_contact->custom_variables;temp_customvariablesmember!=NULL;temp_customvariablesmember=temp_customvariablesmember->next){
-			asprintf(&customvarname,"_CONTACT%s",temp_customvariablesmember->variable_name);
+			if (asprintf(&customvarname,"_CONTACT%s",temp_customvariablesmember->variable_name) == -1)
+				fprintf(stderr,"Failed to allocate string for custom contact variable name output\n");
 			add_custom_variable_to_object(&macro_custom_contact_vars,customvarname,temp_customvariablesmember->variable_value);
 			my_free(customvarname);
 			}
@@ -3247,7 +3324,8 @@ int set_contact_address_environment_vars
 		return OK;
 
 	for(x=0;x<MAX_CONTACT_ADDRESSES;x++){
-		asprintf(&varname,"CONTACTADDRESS%d",x);
+		if (asprintf(&varname,"CONTACTADDRESS%d",x) == -1)
+			fprintf(stderr,"Failed to allocate string for contact address\n");
 		set_macro_environment_var(varname,macro_contact_ptr->address[x],set);
 		my_free(varname);
 		}
@@ -3266,7 +3344,8 @@ int set_macro_environment_var(char *name
 		return ERROR;
 
 	/* create environment var name */
-	asprintf(&env_macro_name,"%s%s",MACRO_ENV_VAR_PREFIX,name);
+	if (asprintf(&env_macro_name,"%s%s",MACRO_ENV_VAR_PREFIX,name) == -1)
+		fprintf(stderr,"Failed to allocate string for macro env var prefix and macro name\n");
 
 	/* set or unset the environment variable */
 	set_environment_var(env_macro_name,value,set);
Index: common/objects.c
===================================================================
--- common/objects.c.orig
+++ common/objects.c
@@ -180,7 +180,6 @@ int skiplist_compare_host(void *a, void
 int skiplist_compare_service(void *a, void *b){
 	service *oa=NULL;
 	service *ob=NULL;
-	int result=0;
 
 	oa=(service *)a;
 	ob=(service *)b;
@@ -325,7 +324,6 @@ int skiplist_compare_hostescalation(void
 int skiplist_compare_serviceescalation(void *a, void *b){
 	serviceescalation *oa=NULL;
 	serviceescalation *ob=NULL;
-	int result=0;
 
 	oa=(serviceescalation *)a;
 	ob=(serviceescalation *)b;
@@ -362,7 +360,6 @@ int skiplist_compare_hostdependency(void
 int skiplist_compare_servicedependency(void *a, void *b){
 	servicedependency *oa=NULL;
 	servicedependency *ob=NULL;
-	int result=0;
 
 	oa=(servicedependency *)a;
 	ob=(servicedependency *)b;
Index: common/statusdata.c
===================================================================
--- common/statusdata.c.orig
+++ common/statusdata.c
@@ -351,13 +351,15 @@ int add_host_status(hoststatus *new_host
 			my_free(new_hoststatus->plugin_output);
 			if(new_hoststatus->should_be_scheduled==TRUE){
 				get_time_string(&new_hoststatus->next_check,date_string,sizeof(date_string),LONG_DATE_TIME);
-				asprintf(&new_hoststatus->plugin_output,"Host check scheduled for %s",date_string);
+				if (asprintf(&new_hoststatus->plugin_output,"Host check scheduled for %s",date_string) == -1)
+					fprintf(stderr,"Could not allocate string for host check schedule output\n");
 			        }
 			else{
 				/* passive-only hosts that have just been scheduled for a forced check */
 				if(new_hoststatus->checks_enabled==FALSE && new_hoststatus->next_check!=(time_t)0L && (new_hoststatus->check_options & CHECK_OPTION_FORCE_EXECUTION)){
 					get_time_string(&new_hoststatus->next_check,date_string,sizeof(date_string),LONG_DATE_TIME);
-					asprintf(&new_hoststatus->plugin_output,"Forced host check scheduled for %s",date_string);
+					if (asprintf(&new_hoststatus->plugin_output,"Forced host check scheduled for %s",date_string) == -1)
+						fprintf(stderr,"Failed to allocate string for forced host check schedule\n");
 					}
 				/* passive-only hosts not scheduled to be checked */
 				else
@@ -423,13 +425,15 @@ int add_service_status(servicestatus *ne
 			my_free(new_svcstatus->plugin_output);
 			if(new_svcstatus->should_be_scheduled==TRUE){
 				get_time_string(&new_svcstatus->next_check,date_string,sizeof(date_string),LONG_DATE_TIME);
-				asprintf(&new_svcstatus->plugin_output,"Service check scheduled for %s",date_string);
+				if (asprintf(&new_svcstatus->plugin_output,"Service check scheduled for %s",date_string) == -1)
+						fprintf(stderr,"Failed to allocate string for service check schedule\n");
 			        }
 			else{
 				/* passive-only services that have just been scheduled for a forced check */
 				if(new_svcstatus->checks_enabled==FALSE && new_svcstatus->next_check!=(time_t)0L && (new_svcstatus->check_options & CHECK_OPTION_FORCE_EXECUTION)){
 					get_time_string(&new_svcstatus->next_check,date_string,sizeof(date_string),LONG_DATE_TIME);
-					asprintf(&new_svcstatus->plugin_output,"Forced service check scheduled for %s",date_string);
+					if (asprintf(&new_svcstatus->plugin_output,"Forced service check scheduled for %s",date_string) == -1)
+						fprintf(stderr,"Failed to allocate string for forced service check schedule\n");
 					}
 				/* passive-only services not scheduled to be checked */
 				else
Index: base/nagios.c
===================================================================
--- base/nagios.c.orig
+++ base/nagios.c
@@ -459,7 +459,10 @@ int main(int argc, char **argv){
 		        }
 
 		/* get absolute path of current working directory */
-		getcwd(config_file,MAX_FILENAME_LENGTH);
+		if (!getcwd(config_file,MAX_FILENAME_LENGTH)){
+			fprintf(stderr,"Can not get absolute pathname of current working directory\n");
+			exit(ERROR);
+		}
 
 		/* append a forward slash */
 		strncat(config_file,"/",1);
@@ -649,7 +652,8 @@ int main(int argc, char **argv){
 			/* get program (re)start time and save as macro */
 			program_start=time(NULL);
 			my_free(macro_x[MACRO_PROCESSSTARTTIME]);
-			asprintf(&macro_x[MACRO_PROCESSSTARTTIME],"%lu",(unsigned long)program_start);
+			if (asprintf(&macro_x[MACRO_PROCESSSTARTTIME],"%lu",(unsigned long)program_start) == -1)
+				fprintf(stderr,"Failed to allocate string for Nagios main process start time\n");
 
 			/* open debug log */
 			open_debug_log();
@@ -676,7 +680,8 @@ int main(int argc, char **argv){
 			now=time(NULL);
 			tm=localtime(&now);
 			strftime(datestring,sizeof(datestring),"%a %b %d %H:%M:%S %Z %Y",tm);
-			asprintf(&buffer,"Local time is %s\n",datestring);
+			if (asprintf(&buffer,"Local time is %s\n",datestring) == -1)
+				fprintf(stderr,"Failed to allocate string for local time output\n");
 			write_to_logs_and_console(buffer,NSLOG_PROCESS_INFO,TRUE);
 			my_free(buffer);
 
@@ -776,7 +781,8 @@ int main(int argc, char **argv){
 					exit(ERROR);
 					}
 
-				asprintf(&buffer,"Finished daemonizing... (New PID=%d)\n",(int)getpid());
+				if (asprintf(&buffer,"Finished daemonizing... (New PID=%d)\n",(int)getpid()) == -1)
+					fprintf(stderr,"Failed to allocate string for new PID output\n");
 				write_to_all_logs(buffer,NSLOG_PROCESS_INFO);
 				my_free(buffer);
 
@@ -842,7 +848,8 @@ int main(int argc, char **argv){
 			/* get event start time and save as macro */
 			event_start=time(NULL);
 			my_free(macro_x[MACRO_EVENTSTARTTIME]);
-			asprintf(&macro_x[MACRO_EVENTSTARTTIME],"%lu",(unsigned long)event_start);
+			if (asprintf(&macro_x[MACRO_EVENTSTARTTIME],"%lu",(unsigned long)event_start) == -1)
+				fprintf(stderr,"Failed to allocate string for event start time\n");
 
 		        /***** start monitoring all services *****/
 			/* (doesn't return until a restart or shutdown signal is encountered) */
@@ -854,9 +861,11 @@ int main(int argc, char **argv){
 			if(caught_signal==TRUE){
 
 				if(sig_id==SIGHUP)
-					asprintf(&buffer,"Caught SIGHUP, restarting...\n");
+					if (asprintf(&buffer,"Caught SIGHUP, restarting...\n") == -1)
+						fprintf(stderr,"Failed to allocate string for information about received SIGHUP\n");
 				else if(sig_id!=SIGSEGV)
-					asprintf(&buffer,"Caught SIG%s, shutting down...\n",sigs[sig_id]);
+					if (asprintf(&buffer,"Caught SIG%s, shutting down...\n",sigs[sig_id]) == -1)
+						fprintf(stderr,"Failed to allocate string for information about received SIG\n");
 
 				write_to_all_logs(buffer,NSLOG_PROCESS_INFO);
 				my_free(buffer);
Index: base/nagiostats.c
===================================================================
--- base/nagiostats.c.orig
+++ base/nagiostats.c
@@ -1380,12 +1380,10 @@ int read_status_file(void){
 int read_nagiostats_file(void){
 	char temp_buffer[MAX_INPUT_BUFFER];
 	FILE *fp=NULL;
-	int data_type=STATUS_NO_DATA;
 	char *var=NULL;
 	char *val=NULL;
 	char *temp_ptr=NULL;
 	time_t current_time;
-	unsigned long time_difference=0L;
 
 	time(&current_time);
 
Index: base/utils.c
===================================================================
--- base/utils.c.orig
+++ base/utils.c
@@ -311,7 +311,7 @@ int my_system(char *cmd,int timeout,int
 	char fname[512]="";
 	char *args[5]={"",DO_CLEAN, "", "", NULL };
 	SV *plugin_hndlr_cr;
-	STRLEN n_a ;
+	STRLEN n_a;
 	char *perl_output=NULL;
 	int count;
 	int use_epn=FALSE;
@@ -379,7 +379,8 @@ int my_system(char *cmd,int timeout,int
 			 */
 			(void) POPs ;
 
-			asprintf(&temp_buffer,"%s", SvPVX(ERRSV));
+			if (asprintf(&temp_buffer,"%s", SvPVX(ERRSV)) == -1)
+				fprintf(stderr,"Failed to allocate string for sending error message through temp buffer\n");
 
 			log_debug_info(DEBUGL_COMMANDS,0,"Embedded perl failed to compile %s, compile error %s\n",fname,temp_buffer);
 
@@ -496,7 +497,8 @@ int my_system(char *cmd,int timeout,int
 			log_debug_info(DEBUGL_COMMANDS,0,"Embedded perl ran command %s with output %d, %s\n",fname,status,buffer);
 
 			/* write the output back to the parent process */
-			write(fd[1],buffer,strlen(buffer)+1);
+			if (write(fd[1],buffer,strlen(buffer)+1) != 1)
+				logit(NSLOG_RUNTIME_ERROR,TRUE,"Cannot write all the lines of output of the embedded perl back to the parent process\n");
 
 			/* close pipe for writing */
 			close(fd[1]);
@@ -520,7 +522,8 @@ int my_system(char *cmd,int timeout,int
 			buffer[sizeof(buffer)-1]='\x0';
 
 			/* write the error back to the parent process */
-			write(fd[1],buffer,strlen(buffer)+1);
+			if (write(fd[1],buffer,strlen(buffer)+1) != 1)
+				logit(NSLOG_RUNTIME_ERROR,TRUE,"Cannot write the error back to the parent process\n");
 
 			result=STATE_CRITICAL;
 		        }
@@ -528,7 +531,8 @@ int my_system(char *cmd,int timeout,int
 
 			/* write all the lines of output back to the parent process */
 			while(fgets(buffer,sizeof(buffer)-1,fp))
-				write(fd[1],buffer,strlen(buffer));
+				if (write(fd[1],buffer,strlen(buffer)) != 1)
+					logit(NSLOG_RUNTIME_ERROR,TRUE,"Cannot write all the lines of output back to the parent process\n");
 
 			/* close the command and get termination status */
 			status=pclose(fp);
@@ -777,7 +781,8 @@ int set_environment_var(char *name, char
 #else
 		/* needed for Solaris and systems that don't have setenv() */
 		/* this will leak memory, but in a "controlled" way, since lost memory should be freed when the child process exits */
-		asprintf(&env_string,"%s=%s",name,(value==NULL)?"":value);
+		if (asprintf(&env_string,"%s=%s",name,(value==NULL)?"":value) == -1)
+			fprintf(stderr,"Failed to allocate string for env_string value allocation output\n");
 		if(env_string)
 			putenv(env_string);
 #endif
@@ -2013,9 +2018,17 @@ int daemon_init(void){
 	/* change working directory. scuttle home if we're dumping core */
 	homedir=getenv("HOME");
 	if(daemon_dumps_core==TRUE && homedir!=NULL)
-		chdir(homedir);
+		if (chdir(homedir) < 0){
+			logit(NSLOG_RUNTIME_ERROR,TRUE,"Failed to chdir to %s\n", homedir);
+			cleanup();
+			exit(ERROR);
+		}
 	else
-		chdir("/");
+		if (chdir("/") < 0){
+			logit(NSLOG_RUNTIME_ERROR,TRUE,"Failed to chdir to /\n");
+			cleanup();
+			exit(ERROR);
+		}
 
 	umask(S_IWGRP|S_IWOTH);
 
@@ -2092,9 +2105,11 @@ int daemon_init(void){
 
 	/* write PID to lockfile... */
 	lseek(lockfile,0,SEEK_SET);
-	ftruncate(lockfile,0);
+	if (ftruncate(lockfile,0) == -1)
+		logit(NSLOG_RUNTIME_ERROR,TRUE,"ftruncate failed on %d\n",lockfile);
 	sprintf(buf,"%d\n",(int)getpid());
-	write(lockfile,buf,strlen(buf));
+	if (write(lockfile,buf,strlen(buf)) != 1)
+		logit(NSLOG_RUNTIME_ERROR,TRUE,"Cannot write PID to lockfile: %s : %s\n",lockfile,strerror(errno));
 
 	/* make sure lock file stays open while program is executing... */
 	val=fcntl(lockfile,F_GETFD,0);
@@ -2230,7 +2245,8 @@ int move_check_result_to_queue(char *che
 	old_umask=umask(new_umask);
 
 	/* create a safe temp file */
-	asprintf(&output_file,"%s/cXXXXXX",check_result_path);
+	if (asprintf(&output_file,"%s/cXXXXXX",check_result_path) == -1)
+		fprintf(stderr,"Could not allocate string for safe temp file output\n");
 	output_file_fd=mkstemp(output_file);
 
 	/* file created okay */
@@ -2253,7 +2269,8 @@ int move_check_result_to_queue(char *che
 #endif
 
 		/* create an ok-to-go indicator file */
-		asprintf(&temp_buffer,"%s.ok",output_file);
+		if (asprintf(&temp_buffer,"%s.ok",output_file) == -1)
+			fprintf(stderr,"Failed to allocate string for ok-to-go indicator file\n");
 		if((output_file_fd=open(temp_buffer,O_CREAT|O_WRONLY|O_TRUNC,S_IRUSR|S_IWUSR))>0)
 			close(output_file_fd);
 		my_free(temp_buffer);
@@ -2338,7 +2355,8 @@ int process_check_result_queue(char *dir
 			/* at this point we have a regular file... */
 
 			/* can we find the associated ok-to-go file ? */
-			asprintf(&temp_buffer,"%s.ok",file);
+			if (asprintf(&temp_buffer,"%s.ok",file) == -1)
+				fprintf(stderr,"Failed to allocate string for the assiciated ok-to-go file\n");
 			result=stat(temp_buffer,&ok_stat_buf);
 			my_free(temp_buffer);
 			if(result==-1)
@@ -2365,7 +2383,6 @@ int process_check_result_queue(char *dir
 /* reads check result(s) from a file */
 int process_check_result_file(char *fname){
 	mmapfile *thefile=NULL;
-	char *temp_buffer=NULL;
 	char *input=NULL;
 	char *var=NULL;
 	char *val=NULL;
@@ -2545,7 +2562,8 @@ int delete_check_result_file(char *fname
 	unlink(fname);
 
 	/* delete the ok-to-go file */
-	asprintf(&temp_buffer,"%s.ok",fname);
+	if (asprintf(&temp_buffer,"%s.ok",fname) == -1)
+		fprintf(stderr,"Failed to allocate string for testing the ok-to-go file\n");
 	unlink(temp_buffer);
 	my_free(temp_buffer);
 
@@ -3287,12 +3305,7 @@ int compare_hashdata(const char *val1a,
 
 /* renames a file - works across filesystems (Mike Wiacek) */
 int my_rename(char *source, char *dest){
-	char buffer[MAX_INPUT_BUFFER]={0};
 	int rename_result=0;
-	int source_fd=-1;
-	int dest_fd=-1;
-	int bytes_read=0;
-
 
 	/* make sure we have something */
 	if(source==NULL || dest==NULL)
@@ -3355,7 +3368,8 @@ int my_fcopy(char *source, char *dest){
 			
 			/* copy file contents */
 			while((bytes_read=read(source_fd,buffer,sizeof(buffer)))>0)
-				write(dest_fd,buffer,bytes_read);
+				if (write(dest_fd,buffer,bytes_read) != 1)
+					logit(NSLOG_RUNTIME_ERROR,TRUE,"Error: unable to copy file contents\n");
 
 			close(source_fd);
 			close(dest_fd);
@@ -3679,7 +3693,6 @@ int init_embedded_perl(char **env){
 #ifdef EMBEDDEDPERL
 	void **embedding;
 	int exitstatus=0;
-	char *temp_buffer=NULL;
 	int argc=2;
 	struct stat stat_buf;
 
@@ -3760,7 +3773,8 @@ int file_uses_embedded_perl(char *fname)
 		if(fp!=NULL){
 
 			/* grab the first line - we should see Perl */
-			fgets(line1,80,fp);
+			if (!fgets(line1,80,fp))
+				use_epn=FALSE;
 
 			/* yep, its a Perl script... */
 			if(strstr(line1,"/bin/perl")!=NULL){
@@ -4082,7 +4096,8 @@ int submit_raw_external_command(char *cm
 		time(&timestamp);
 
 	/* create the command string */
-	asprintf(&newcmd,"[%lu] %s",(unsigned long)timestamp,cmd);
+	if (asprintf(&newcmd,"[%lu] %s",(unsigned long)timestamp,cmd) == -1)
+		fprintf(stderr,"Failed to allocate string for external command string\n");
 
 	/* submit the command */
 	result=submit_external_command(newcmd,buffer_items);
Index: common/downtime.c
===================================================================
--- common/downtime.c.orig
+++ common/downtime.c
@@ -271,9 +271,11 @@ int register_downtime(int type, unsigned
 	else
 		type_string="service";
 	if(temp_downtime->fixed==TRUE)
-		asprintf(&temp_buffer,"This %s has been scheduled for fixed downtime from %s to %s.  Notifications for the %s will not be sent out during that time period.",type_string,start_time_string,end_time_string,type_string);
+		if (asprintf(&temp_buffer,"This %s has been scheduled for fixed downtime from %s to %s.  Notifications for the %s will not be sent out during that time period.",type_string,start_time_string,end_time_string,type_string) == -1)
+			fprintf(stderr,"Failed to allocate string for fixed downtime notification\n");
 	else
-		asprintf(&temp_buffer,"This %s has been scheduled for flexible downtime starting between %s and %s and lasting for a period of %d hours and %d minutes.  Notifications for the %s will not be sent out during that time period.",type_string,start_time_string,end_time_string,hours,minutes,type_string);
+		if (asprintf(&temp_buffer,"This %s has been scheduled for flexible downtime starting between %s and %s and lasting for a period of %d hours and %d minutes.  Notifications for the %s will not be sent out during that time period.",type_string,start_time_string,end_time_string,hours,minutes,type_string) == -1)
+			fprintf(stderr,"Failed to allocate string for flexible downtime notification\n");
 
 
 	log_debug_info(DEBUGL_DOWNTIME,0,"Scheduled Downtime Details:\n");
Index: xdata/xsddefault.c
===================================================================
--- xdata/xsddefault.c.orig
+++ xdata/xsddefault.c
@@ -338,7 +338,6 @@ int xsddefault_save_status_data(void){
 	FILE *fp=NULL;
 	int used_external_command_buffer_slots=0;
 	int high_external_command_buffer_slots=0;
-	void *ptr=NULL;
 	int result=OK;
 
 	log_debug_info(DEBUGL_FUNCTIONS,0,"save_status_data()\n");
@@ -346,7 +345,8 @@ int xsddefault_save_status_data(void){
 	/* open a safe temp file for output */
 	if(xsddefault_temp_file==NULL)
 		return ERROR;
-	asprintf(&temp_file,"%sXXXXXX",xsddefault_temp_file);
+	if (asprintf(&temp_file,"%sXXXXXX",xsddefault_temp_file) == -1)
+		fprintf(stderr,"Failed to allocate string for safe temp file output\n");
 	if(temp_file==NULL)
 		return ERROR;
 
Index: base/checks.c
===================================================================
--- base/checks.c.orig
+++ base/checks.c
@@ -134,7 +134,6 @@ int reap_check_results(void){
 	check_result *queued_check_result=NULL;
 	service *temp_service=NULL;
 	host *temp_host=NULL;
-	char *temp_buffer=NULL;
 	time_t current_time=0L;
 	time_t reaper_start_time=0L;
 	int reaped_checks=0;
Index: base/config.c
===================================================================
--- base/config.c.orig
+++ base/config.c
@@ -294,24 +294,28 @@ int read_main_config_file(char *main_con
 
 		/* get the variable name */
 		if((temp_ptr=my_strtok(input,"="))==NULL){
-			asprintf(&error_message,"NULL variable");
+			if (asprintf(&error_message,"NULL variable") == -1)
+				fprintf(stderr,"Failed to allocate string for NULL variable error message\n");
 			error=TRUE;
 			break;
 			}
 		if((variable=(char *)strdup(temp_ptr))==NULL){
-			asprintf(&error_message,"malloc() error");
+			if (asprintf(&error_message,"malloc() error") == -1)
+				fprintf(stderr,"Failed to allocate string for malloc error message\n");
 			error=TRUE;
 			break;
 		        }
 
 		/* get the value */
 		if((temp_ptr=my_strtok(NULL,"\n"))==NULL){
-			asprintf(&error_message,"NULL value");
+			if (asprintf(&error_message,"NULL value") == -1)
+				fprintf(stderr,"Failed to allocate string for NULL value error message\n");
 			error=TRUE;
 			break;
 			}
 		if((value=(char *)strdup(temp_ptr))==NULL){
-			asprintf(&error_message,"malloc() error");
+			if (asprintf(&error_message,"malloc() error") == -1)
+				fprintf(stderr,"Failed to allocate string for malloc error message\n");
 			error=TRUE;
 			break;
 		        }
Index: base/nebmods.c
===================================================================
--- base/nebmods.c.orig
+++ base/nebmods.c
@@ -199,7 +199,8 @@ int neb_load_module(nebmodule *mod){
 	************/
 
 	/* open a temp file for copying the module */
-	asprintf(&output_file,"%s/nebmodXXXXXX",temp_path);
+	if (asprintf(&output_file,"%s/nebmodXXXXXX",temp_path) == -1)
+		fprintf(stderr,"Failed to allocate string for temp temp path\n");
 	if((dest_fd=mkstemp(output_file))==-1){
 		logit(NSLOG_RUNTIME_ERROR,FALSE,"Error: Could not safely copy module '%s'.  The module will not be loaded: %s\n",mod->filename,strerror(errno));
 		return ERROR;
@@ -207,7 +208,8 @@ int neb_load_module(nebmodule *mod){
 	/* open module file for reading and copy it */
 	if((source_fd=open(mod->filename,O_RDONLY,0644))>0){
 		while((bytes_read=read(source_fd,buffer,sizeof(buffer)))>0)
-			write(dest_fd,buffer,bytes_read);
+			if (write(dest_fd,buffer,bytes_read) != 1)
+				logit(NSLOG_RUNTIME_ERROR,FALSE,"Erro: Could not write into module file '%s': %s\n",mod->filename,strerror(errno));
 		close(source_fd);
 		close(dest_fd);
 		}

Places

File nagios-3.2.1-fix_compiler_warnings.patch of Package nagios (Revision a578b90279184a06cc2aaa77356e477c)

Places