archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bug #61097 Memory leak in xmlrpc functions copying zvals

Browse source 
Needs to be merged to 5.4.
This commit is contained in:
Nikita Popov 2012-02-18 14:58:19 +00:00
parent 032bbc3164
commit 957029f44a
2 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/xmlrpc/tests/bug61097.phpt Normal file
View file

@ -0,0 +1,16 @@
--TEST--
Bug #61097 (Memory leak in xmlrpc functions copying zvals)
--SKIPIF--
<?php if (!extension_loaded("xmlrpc")) print "skip"; ?>
--FILE--
<?php
$server = xmlrpc_server_create();
$method = 'abc';
xmlrpc_server_register_introspection_callback($server, $method);
xmlrpc_server_register_method($server, 'abc', $method);
echo 'Done';
?>
--EXPECT--
Done

10
ext/xmlrpc/xmlrpc-epi-php.c
View file

@ -1043,9 +1043,8 @@ PHP_FUNCTION(xmlrpc_server_register_method)
*/ */
if (XMLRPC_ServerRegisterMethod(server->server_ptr, method_key, php_xmlrpc_callback)) { if (XMLRPC_ServerRegisterMethod(server->server_ptr, method_key, php_xmlrpc_callback)) {
/* save for later use */ /* save for later use */
MAKE_STD_ZVAL(method_name_save); ALLOC_ZVAL(method_name_save);
*method_name_save = **method_name; MAKE_COPY_ZVAL(method_name, method_name_save);
zval_copy_ctor(method_name_save);
/* register our php method */ /* register our php method */
add_zval(server->method_map, method_key, &method_name_save); add_zval(server->method_map, method_key, &method_name_save);
@ -1073,9 +1072,8 @@ PHP_FUNCTION(xmlrpc_server_register_introspection_callback)
if (type == le_xmlrpc_server) { if (type == le_xmlrpc_server) {
/* save for later use */ /* save for later use */
MAKE_STD_ZVAL(method_name_save); ALLOC_ZVAL(method_name_save);
*method_name_save = **method_name; MAKE_COPY_ZVAL(method_name, method_name_save);
zval_copy_ctor(method_name_save);
/* register our php method */ /* register our php method */
add_zval(server->introspection_map, NULL, &method_name_save); add_zval(server->introspection_map, NULL, &method_name_save);