From: Jani Taskinen <jani@php.net>
Date: Sat, 2 May 2009 21:13:39 +0000 (+0000)
Subject: - Revert bad patch (which caused bug #48133)
X-Git-Tag: php-5.4.0alpha1~191^2~3780
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abda62eace8e6da9f9524cf6841a2259360e966a;p=php

- Revert bad patch (which caused bug #48133)
---

diff --git a/ext/snmp/snmp.c b/ext/snmp/snmp.c
index c9eaa9f995..9c6c6b443c 100644
--- a/ext/snmp/snmp.c
+++ b/ext/snmp/snmp.c
@@ -1,6 +1,6 @@
 /*
    +----------------------------------------------------------------------+
-   | PHP Version 6                                                        |
+   | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
    | Copyright (c) 1997-2009 The PHP Group                                |
    +----------------------------------------------------------------------+
@@ -655,13 +655,13 @@ retry:
 						*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 @@ retry:
 					}
 					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);