[Pkg-nagios-changes] [pkg-nagios] r2089 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 714281 pending
thanks

Author: waja
Date: 2013-07-08 11:16:49 +0000 (Mon, 08 Jul 2013)
New Revision: 2089

Added:
   nagios-plugins/trunk/debian/patches/11_check_nt_npe.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
Fixing NULL pointer dereference in check_nt (Closes: #714281)

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2013-06-25 14:09:06 UTC (rev 2088)
+++ nagios-plugins/trunk/debian/changelog	2013-07-08 11:16:49 UTC (rev 2089)
@@ -11,6 +11,8 @@
   * Fix FTBFS: do not assume that gets is defined (LP: #1097848).
   * Add performance data to check_apt: 10_check_apt_perfdata.dpatch
     (Closes: #708343)
+  * Fixing NULL pointer dereference in check_nt (Closes: #714281), thanks to
+    Vaclav Ovsik
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 27 Jun 2012 23:14:40 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2013-06-25 14:09:06 UTC (rev 2088)
+++ nagios-plugins/trunk/debian/patches/00list	2013-07-08 11:16:49 UTC (rev 2089)
@@ -1,5 +1,6 @@
 02_check_icmp_links.dpatch
 05_fix_gets_undefined_in_iso_c11.dpatch
 10_check_apt_perfdata.dpatch
+11_check_nt_npe.dpatch
 # commited upstream
 

Added: nagios-plugins/trunk/debian/patches/11_check_nt_npe.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/11_check_nt_npe.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/11_check_nt_npe.dpatch	2013-07-08 11:16:49 UTC (rev 2089)
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 11_check_nt_npe.dpatch by Vaclav Ovsik <vaclav.ovsik at i.cz>
+##
+## DP: Fixes some NULL pointer dereference in check_nt.
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-plugins-1.4.16~/plugins/check_nt.c nagios-plugins-1.4.16/plugins/check_nt.c
+--- nagios-plugins-1.4.16~/plugins/check_nt.c	2013-06-29 18:11:20.000000000 +0200
++++ nagios-plugins-1.4.16/plugins/check_nt.c	2013-06-29 18:22:52.000000000 +0200
+@@ -94,6 +94,7 @@
+ 	char *description=NULL,*counter_unit = NULL;
+ 	char *minval = NULL, *maxval = NULL, *errcvt = NULL;
+ 	char *fds=NULL, *tds=NULL;
++	char *numstr;
+ 
+ 	double total_disk_space=0;
+ 	double free_disk_space=0;
+@@ -265,7 +266,10 @@
+ 			asprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
+ 							 (show_all==TRUE) ? "ShowAll" : "ShowFail",value_list);
+ 			fetch_data (server_address, server_port, send_buffer);
+-			return_code=atoi(strtok(recv_buffer,"&"));
++			numstr = strtok(recv_buffer,"&");
++			if (numstr == NULL)
++				die(STATE_UNKNOWN, _("could not fetch information from server\n"));
++			return_code=atoi(numstr);
+ 			temp_string=strtok(NULL,"&");
+ 			output_message = strdup (temp_string);
+ 		}
+@@ -275,8 +279,14 @@
+ 
+ 		asprintf(&send_buffer,"%s&7", req_password);
+ 		fetch_data (server_address, server_port, send_buffer);
+-		mem_commitLimit=atof(strtok(recv_buffer,"&"));
+-		mem_commitByte=atof(strtok(NULL,"&"));
++		numstr = strtok(recv_buffer,"&");
++		if (numstr == NULL)
++			die(STATE_UNKNOWN, _("could not fetch information from server\n"));
++		mem_commitLimit=atof(numstr);
++		numstr = strtok(NULL,"&");
++		if (numstr == NULL)
++			die(STATE_UNKNOWN, _("could not fetch information from server\n"));
++		mem_commitByte=atof(numstr);
+ 		percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
+ 		warning_used_space = ((float)warning_value / 100) * mem_commitLimit;
+ 		critical_used_space = ((float)critical_value / 100) * mem_commitLimit;