MFH: fix bug #42369 (Implicit conversion to string leaks memory)

add test

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index fce96bbe7221da2d198828077065ad28a34a2ea4..f70efed3686899919490d6743c1894e6073cb31c 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1787,6 +1787,11 @@ static int sxe_object_cast(zval *readobj, zval *writeobj, int type TSRMLS_DC)
                }
        }
 
+       if (readobj == writeobj) {
+               INIT_PZVAL(writeobj);
+               zval_dtor(readobj);
+       }
+
        rv = cast_object(writeobj, type, (char *)contents TSRMLS_CC);
 
        if (contents) {

diff --git a/ext/simplexml/tests/bug42369.phpt b/ext/simplexml/tests/bug42369.phpt
new file mode 100644 (file)
index 0000000..e5df814
--- /dev/null
+++ b/ext/simplexml/tests/bug42369.phpt
@@ -0,0 +1,25 @@
+--TEST--
+Bug #42369 (Implicit conversion to string leaks memory)
+--SKIPIF--
+<?php if (!extension_loaded('simplexml')) echo 'skip simplexml extension is not loaded'; >
+--FILE--
+<?php
+    $xml = '<?xml version="1.0" encoding="utf-8"?>';
+    $x = simplexml_load_string($xml . "<q><x>foo</x></q>");
+
+    echo 'explicit conversion' . PHP_EOL;
+    for ($i = 0; $i < 100000; $i++) {
+        md5(strval($x->x));
+    }
+
+    echo 'no conversion' . PHP_EOL;
+    for ($i = 0; $i < 100000; $i++) {
+        md5($x->x);
+    }
+
+    echo 'done' . PHP_EOL;
+?>
+--EXPECT--
+explicit conversion
+no conversion
+done
\ No newline at end of file