From 3e7792aed7b6a8473e83bdb2417bbeefa009f65c Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikic@php.net>
Date: Sat, 3 Mar 2012 12:46:17 +0000
Subject: [PATCH] Fix bug #61264: xmlrpc_parse_method_descriptions leaks
 temporary variable

---
 NEWS                           |  1 +
 ext/xmlrpc/tests/bug61264.phpt | 17 +++++++++++++++++
 ext/xmlrpc/xmlrpc-epi-php.c    |  3 +--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 ext/xmlrpc/tests/bug61264.phpt

diff --git a/NEWS b/NEWS
index 0a2cec12951..a379c918cf1 100644
--- a/NEWS
+++ b/NEWS
@@ -73,6 +73,7 @@ PHP                                                                        NEWS
 
 - XMLRPC:
   . Fixed bug #61097 (Memory leak in xmlrpc functions copying zvals). (Nikic)
+  . Fixed bug #61264 (xmlrpc_parse_method_descriptions leaks temporary variable). (Nikita Popov)
 
 - Zlib:
   . Fixed bug #61139 (gzopen leaks when specifying invalid mode). (Nikic)
diff --git a/ext/xmlrpc/tests/bug61264.phpt b/ext/xmlrpc/tests/bug61264.phpt
new file mode 100644
index 00000000000..b1da27f2520
--- /dev/null
+++ b/ext/xmlrpc/tests/bug61264.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug #61264: xmlrpc_parse_method_descriptions leaks temporary variable
+--FILE--
+<?php
+$xml = <<<XML
+<?xml version="1.0" encoding="utf-8"?>
+<a>
+ <b>foo</b>
+</a>
+XML;
+var_dump(xmlrpc_parse_method_descriptions($xml));
+?>
+--EXPECT--
+array(1) {
+  ["b"]=>
+  string(3) "foo"
+}
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c
index 13886c75373..cf5e257113c 100644
--- a/ext/xmlrpc/xmlrpc-epi-php.c
+++ b/ext/xmlrpc/xmlrpc-epi-php.c
@@ -1240,8 +1240,7 @@ PHP_FUNCTION(xmlrpc_parse_method_descriptions)
 			retval = XMLRPC_to_PHP(xVal);
 
 			if (retval) {
-				*return_value = *retval;
-				zval_copy_ctor(return_value);
+				RETVAL_ZVAL(retval, 1, 1);
 			}
 			/* dust, sweep, and mop */
 			XMLRPC_CleanupValue(xVal);