]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Fix off by one in SNMP subsystem
authorSebastian Krahmer <krahmer@suse.com>
Mon, 15 Sep 2014 04:59:53 +0000 (22:59 -0600)
committerAmos Jeffries <squid3@treenet.co.nz>
Mon, 15 Sep 2014 04:59:53 +0000 (22:59 -0600)
src/snmp_core.cc

index 691ac742995915e4b2b44e6b65ad6849db42e5d5..6468482756afccdb257c28af24238232088b067d 100644 (file)
@@ -356,7 +356,7 @@ snmpClosePorts(void)
 void
 snmpHandleUdp(int sock, void *not_used)
 {
-    LOCAL_ARRAY(char, buf, SNMP_REQUEST_SIZE);
+    static char buf[SNMP_REQUEST_SIZE];
     Ip::Address from;
     snmp_request_t *snmp_rq;
     int len;
@@ -365,16 +365,11 @@ snmpHandleUdp(int sock, void *not_used)
 
     Comm::SetSelect(sock, COMM_SELECT_READ, snmpHandleUdp, NULL, 0);
 
-    memset(buf, '\0', SNMP_REQUEST_SIZE);
+    memset(buf, '\0', sizeof(buf));
 
-    len = comm_udp_recvfrom(sock,
-                            buf,
-                            SNMP_REQUEST_SIZE,
-                            0,
-                            from);
+    len = comm_udp_recvfrom(sock, buf, sizeof(buf)-1, 0, from);
 
     if (len > 0) {
-        buf[len] = '\0';
         debugs(49, 3, "snmpHandleUdp: FD " << sock << ": received " << len << " bytes from " << from << ".");
 
         snmp_rq = (snmp_request_t *)xcalloc(1, sizeof(snmp_request_t));