summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Lytochkin <lytboris@php.net>2011-01-31 11:34:12 +0000
committerBoris Lytochkin <lytboris@php.net>2011-01-31 11:34:12 +0000
commitbd810ef9bcf4e5505206ee17e1bcb6e13eb4e00a (patch)
treee62d807e09e815615afebadaba21f12e5e7e8006
parent4a2b458835beb22df12e4398e1b4aa06e4716a8a (diff)
downloadphp-git-bd810ef9bcf4e5505206ee17e1bcb6e13eb4e00a.tar.gz
Fixed bug #51336
-rw-r--r--NEWS3
-rw-r--r--ext/snmp/snmp.c2
2 files changed, 4 insertions, 1 deletions
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;