From 957029f44aabc4d297ea42c2757de5ef809c61d5 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 18 Feb 2012 14:58:19 +0000 Subject: [PATCH] Fix bug #61097 Memory leak in xmlrpc functions copying zvals Needs to be merged to 5.4. --- ext/xmlrpc/tests/bug61097.phpt | 16 ++++++++++++++++ ext/xmlrpc/xmlrpc-epi-php.c | 10 ++++------ 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 ext/xmlrpc/tests/bug61097.phpt diff --git a/ext/xmlrpc/tests/bug61097.phpt b/ext/xmlrpc/tests/bug61097.phpt new file mode 100644 index 0000000000..1b75247225 --- /dev/null +++ b/ext/xmlrpc/tests/bug61097.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #61097 (Memory leak in xmlrpc functions copying zvals) +--SKIPIF-- + +--FILE-- + +--EXPECT-- +Done diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 7fb97d21e1..13886c7537 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -1043,9 +1043,8 @@ PHP_FUNCTION(xmlrpc_server_register_method) */ if (XMLRPC_ServerRegisterMethod(server->server_ptr, method_key, php_xmlrpc_callback)) { /* save for later use */ - MAKE_STD_ZVAL(method_name_save); - *method_name_save = **method_name; - zval_copy_ctor(method_name_save); + ALLOC_ZVAL(method_name_save); + MAKE_COPY_ZVAL(method_name, method_name_save); /* register our php method */ 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) { /* save for later use */ - MAKE_STD_ZVAL(method_name_save); - *method_name_save = **method_name; - zval_copy_ctor(method_name_save); + ALLOC_ZVAL(method_name_save); + MAKE_COPY_ZVAL(method_name, method_name_save); /* register our php method */ add_zval(server->introspection_map, NULL, &method_name_save); -- 2.40.0