fix bug #59613 (Crash with clone XMLReader)

diff --git a/NEWS b/NEWS
index c2086c07910b85bf3cd78411cde9dd5953c99d9c..c6961bd24fc8b0f2c2b64c3e1821448fdf652420 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ PHP                                                                        NEWS
   . Fixed bug #65808 (the socket_connect() won't work with IPv6 address).
     (Mike)
 
+- XMLReader:
+  . Fixed bug #59613 (Crash with clone XMLReader). (Mike)
+
+
 ?? ??? 2013, PHP 5.4.21
 
 - Core:

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index f4c2643212f2779dc54594b89440ea172569ba05..8b803200976de092f7b9c8fb5ec9b6db98b33a4d 100644 (file)
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -1320,6 +1320,7 @@ PHP_MINIT_FUNCTION(xmlreader)
        xmlreader_object_handlers.read_property = xmlreader_read_property;
        xmlreader_object_handlers.write_property = xmlreader_write_property;
        xmlreader_object_handlers.get_property_ptr_ptr = xmlreader_get_property_ptr_ptr;
+       xmlreader_object_handlers.clone_obj = NULL;
 
        INIT_CLASS_ENTRY(ce, "XMLReader", xmlreader_functions);
        ce.create_object = xmlreader_objects_new;

diff --git a/ext/xmlreader/tests/bug51963.phpt b/ext/xmlreader/tests/bug51963.phpt
new file mode 100644 (file)
index 0000000..af47f97
--- /dev/null
+++ b/ext/xmlreader/tests/bug51963.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Bug #59613 (Crash with clone XMLReader)
+--SKIPIF--
+<?php
+extension_loaded("xmlreader") or die("skip requires xmlreader");
+?>
+--FILE--
+<?php
+echo "Test\n";
+
+$xmlreader = new XMLReader();
+$xmlreader->xml("<a><b/></a>");
+
+$xmlreader->next();
+$xmlreader2 = clone $xmlreader;
+$xmlreader2->next();
+?>
+Done
+--EXPECTF--
+Test
+
+Fatal error: Trying to clone an uncloneable object of class XMLReader in %s on line %d