com php-src: Fixed double free (xmlrpc is done, 1 test failed due to knew issue): ext/xmlrpc/xmlrpc-epi-php.c

Commit: b0f434c3dd81ae51259983cb110a25c4ad418726 Author: Xinchen Hui <laruence@php.net> Mon, 12 May 2014 20:39:52 +0800 Parents: dec5fa6c087c67faede90f7cccae711d7a78915d Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b0f434c3dd81ae51259983cb110a25c4ad418726 Log: Fixed double free (xmlrpc is done, 1 test failed due to knew issue) Changed paths: M ext/xmlrpc/xmlrpc-epi-php.c Diff: diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 2724abb..ea0d3c2 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); }