Fixed bug #51336

diff --git a/NEWS b/NEWS
index 032190a35513a243f7cf57e91aade1b60f385ab6..9ad592e2104e939a3ef238df934a2b1488ce7083 100644 (file)
--- 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 76c97aba0f7df651bafb15414c3df7e9ef7e6038..063b492dd18db072b57d0dc557d278380574c92b 100644 (file)
--- 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;