lytboris                                 Mon, 31 Jan 2011 11:34:12 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307876

Log:
Fixed bug #51336

Bug: http://bugs.php.net/51336 (Open) snmprealwalk (snmp v1) does not handle 
end of OID tree correctly
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/snmp/snmp.c
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/snmp/snmp.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2011-01-31 11:17:22 UTC (rev 307875)
+++ php/php-src/branches/PHP_5_2/NEWS   2011-01-31 11:34:12 UTC (rev 307876)
@@ -8,6 +8,9 @@
 - Fixed bug #53568 (swapped memset arguments in struct initialization).
   (crrodriguez at opensuse dot org)

+- Fixed bug #51336 (snmprealwalk (snmp v1) does not handle end of OID tree 
correctly)
+  (Boris Lytochkin)
+
 06 Jan 2010, PHP 5.2.17
 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott,
   Rasmus)

Modified: php/php-src/branches/PHP_5_2/ext/snmp/snmp.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/snmp/snmp.c        2011-01-31 11:17:22 UTC 
(rev 307875)
+++ php/php-src/branches/PHP_5_2/ext/snmp/snmp.c        2011-01-31 11:34:12 UTC 
(rev 307876)
@@ -502,7 +502,7 @@
                                        }
                                }
                        } 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;

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-01-31 11:17:22 UTC (rev 307875)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-01-31 11:34:12 UTC (rev 307876)
@@ -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)

Modified: php/php-src/branches/PHP_5_3/ext/snmp/snmp.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/snmp/snmp.c        2011-01-31 11:17:22 UTC 
(rev 307875)
+++ php/php-src/branches/PHP_5_3/ext/snmp/snmp.c        2011-01-31 11:34:12 UTC 
(rev 307876)
@@ -689,7 +689,7 @@
                                        }
                                }
                        } 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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to