From: Boris Lytochkin <lytboris@php.net>
Date: Mon, 31 Jan 2011 11:34:12 +0000 (+0000)
Subject: Fixed bug #51336
X-Git-Tag: php-5.3.6RC1~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd810ef9bcf4e5505206ee17e1bcb6e13eb4e00a;p=php

Fixed bug #51336
---

diff --git a/NEWS b/NEWS
index 032190a355..9ad592e210 100644
--- a/NEWS
+++ b/NEWS
@@ -157,6 +157,9 @@
   . Fixed bug #53885 (ZipArchive segfault with FL_UNCHANGED on empty archive).
     (Stas, Maksymilian Arciemowicz).
 
+- Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree correctly)
+  (Boris Lytochkin)
+
 06 Jan 2011, PHP 5.3.5
 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, 
   Rasmus)
diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index 76c97aba0f..063b492dd1 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -689,7 +689,7 @@ retry:
 					}
 				}	
 			} else {
-				if (st != SNMP_CMD_WALK || response->errstat != SNMP_ERR_NOSUCHNAME) {
+				if ((st != SNMP_CMD_WALK && st != SNMP_CMD_REALWALK) || response->errstat != SNMP_ERR_NOSUCHNAME) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in packet: %s", snmp_errstring(response->errstat));
 					if (response->errstat == SNMP_ERR_NOSUCHNAME) {
 						for (count=1, vars = response->variables; vars && count != response->errindex;