jani Sat May 2 21:13:54 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/snmp snmp.c
Log:
MFH:- Revert bad patch (which caused bug #48133)
http://cvs.php.net/viewvc.cgi/php-src/ext/snmp/snmp.c?r1=1.106.2.2.2.5.2.10&r2=1.106.2.2.2.5.2.11&diff_format=u
Index: php-src/ext/snmp/snmp.c
diff -u php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.10
php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.11
--- php-src/ext/snmp/snmp.c:1.106.2.2.2.5.2.10 Wed Dec 31 11:15:43 2008
+++ php-src/ext/snmp/snmp.c Sat May 2 21:13:54 2009
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: snmp.c,v 1.106.2.2.2.5.2.10 2008/12/31 11:15:43 sebastian Exp $ */
+/* $Id: snmp.c,v 1.106.2.2.2.5.2.11 2009/05/02 21:13:54 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -655,13 +655,13 @@
*return_value = *snmpval;
zval_copy_ctor(return_value);
zval_ptr_dtor(&snmpval);
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
snmp_close(ss);
return;
} else if (st == SNMP_CMD_GETNEXT) {
*return_value = *snmpval;
zval_copy_ctor(return_value);
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
snmp_close(ss);
return;
} else if (st == SNMP_CMD_WALK) {
@@ -700,28 +700,28 @@
}
if (st == SNMP_CMD_GET) {
if ((pdu =
snmp_fix_pdu(response, SNMP_MSG_GET)) != NULL) {
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
goto retry;
}
} else if (st == SNMP_CMD_SET) {
if ((pdu =
snmp_fix_pdu(response, SNMP_MSG_SET)) != NULL) {
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
goto retry;
}
} else if (st == SNMP_CMD_GETNEXT) {
if ((pdu =
snmp_fix_pdu(response, SNMP_MSG_GETNEXT)) != NULL) {
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
goto retry;
}
} else if (st >= SNMP_CMD_WALK) { /*
Here we do walks. */
if ((pdu =
snmp_fix_pdu(response, ((session->version == SNMP_VERSION_1)
? SNMP_MSG_GETNEXT
: SNMP_MSG_GETBULK))) != NULL) {
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
goto retry;
}
}
- snmp_free_pdu(pdu);
+ snmp_free_pdu(response);
snmp_close(ss);
if (st == SNMP_CMD_WALK || st ==
SNMP_CMD_REALWALK) {
zval_dtor(return_value);-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
