]> granicus.if.org Git - php/commitdiff
Fixed double free (xmlrpc is done, 1 test failed due to knew issue)
authorXinchen Hui <laruence@php.net>
Mon, 12 May 2014 12:39:52 +0000 (20:39 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 12 May 2014 12:40:08 +0000 (20:40 +0800)
ext/xmlrpc/xmlrpc-epi-php.c

index 2724abbb91a26d9b216b45b3ef5ff81bad800e7f..ea0d3c27ec4211c0cc1f790ba7a09d11c4c40e02 100644 (file)
@@ -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);
 }