From: Xinchen Hui <laruence@php.net>
Date: Mon, 12 May 2014 12:39:52 +0000 (+0800)
Subject: Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
X-Git-Tag: POST_PHPNG_MERGE~380^2~6^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0f434c3dd81ae51259983cb110a25c4ad418726;p=php

Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
---

diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 2724abbb91..ea0d3c27ec 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -754,6 +754,7 @@ void decode_request_worker(char *xml_in, int xml_in_len, char *encoding_in, zval
 					ZVAL_STRING(method_name_out, method_name);
 				} else {
 					zval_ptr_dtor(retval);
+					ZVAL_NULL(retval);
 				}
 			}
 		}
@@ -889,7 +890,6 @@ static XMLRPC_VALUE php_xmlrpc_callback(XMLRPC_SERVER server, XMLRPC_REQUEST xRe
 	pData->php_executed = 1;
 
 	zval_ptr_dtor(&xmlrpc_params);
-	zval_ptr_dtor(&pData->xmlrpc_method);
 
 	return PHP_to_XMLRPC(&pData->return_data TSRMLS_CC);
 }