Fixed bug #28771 (Segfault when using xslt and clone)

Add test case for bug #28721

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index ca6403685db3111eb36e250515f0a79dc237f9f7..8c2857e64f891550d2d4a4d8c49f9ebbe2ccf6dc 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -322,6 +322,30 @@ PHP_FUNCTION(dom_import_simplexml)
 }
 /* }}} */
 
+zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC)
+{
+       zend_object_value retval;
+       void *new_object;
+       dom_object *intern;
+       struct _store_object *obj;
+       zend_object_handle handle = Z_OBJ_HANDLE_P(zobject);
+
+       obj = &EG(objects_store).object_buckets[handle].bucket.obj;
+       
+       if (obj->clone == NULL) {
+               zend_error(E_CORE_ERROR, "Trying to clone uncloneable object of class %s", Z_OBJCE_P(zobject)->name);
+       }               
+
+       obj->clone(obj->object, &new_object TSRMLS_CC);
+
+       retval.handle = zend_objects_store_put(new_object, obj->dtor, obj->free_storage, obj->clone TSRMLS_CC);
+       intern = (dom_object *) new_object;
+       intern->handle = retval.handle;
+       retval.handlers = Z_OBJ_HT_P(zobject);
+       
+       return retval;
+}
+
 static zend_function_entry dom_functions[] = {
        PHP_FE(dom_import_simplexml, NULL)
        {NULL, NULL, NULL}
@@ -353,7 +377,7 @@ PHP_MINIT_FUNCTION(dom)
        dom_object_handlers.read_property = dom_read_property;
        dom_object_handlers.write_property = dom_write_property;
        dom_object_handlers.get_property_ptr_ptr = NULL;
-       dom_object_handlers.clone_obj = zend_objects_store_clone_obj;
+       dom_object_handlers.clone_obj = dom_objects_store_clone_obj;
 
        zend_hash_init(&classes, 0, NULL, NULL, 1);
 

diff --git a/ext/dom/tests/bug28721.phpt b/ext/dom/tests/bug28721.phpt
new file mode 100644 (file)
index 0000000..a9aef38
--- /dev/null
+++ b/ext/dom/tests/bug28721.phpt
@@ -0,0 +1,485 @@
+--TEST--
+Bug # 28721: (appendChild() and insertBefore() unset DOMText)
+--SKIPIF--
+<?php require_once('skipif.php'); ?>
+--FILE--
+<?php
+function print_node(DomNode $node) {
+  echo "name (value): " . $node->nodeName . " (" . $node->nodeValue . ")\n";
+}
+
+function print_node_r(DomNode $node) {
+  static $indent = "";
+  echo "\n" . $indent;
+  print_node($node);
+
+  echo $indent . "parent: ";
+  if ( $node->parentNode )
+    print_node($node->parentNode);
+  else
+    echo "NULL\n";
+
+  echo $indent . "previousSibling: ";
+  if ( $node->previousSibling )
+    print_node($node->previousSibling);
+  else
+    echo "NULL\n";
+  
+  echo $indent . "nextSibling: ";
+  if ( $node->nextSibling )
+    print_node($node->nextSibling);
+  else
+    echo "NULL\n";
+
+  if ( !$node->hasChildNodes() )
+    return;
+  
+  foreach ($node->childNodes as $child) {
+
+    $old_indent  = $indent;
+    $indent .= "  ";
+    print_node_r($child);
+    $indent = $old_indent;
+  }
+}
+
+function err_handler($errno, $errstr, $errfile, $errline) {
+  echo "Error ($errno) on line $errline: $errstr\n";
+}
+
+// Record 'DocumentFragment is empty' warnings
+set_error_handler("err_handler", E_WARNING);
+
+$xml = new DomDocument();
+
+$p = $xml->createElement("p");
+
+$p->appendChild($t1 = $xml->createTextNode(" t1 "));
+$p->appendChild($b = $xml->createElement("b"));
+$b->appendChild($xml->createTextNode("X"));
+$p->appendChild($t2 = $xml->createTextNode(" t2 "));
+$p->appendChild($xml->createTextNode(" xxx "));
+
+print_node_r($p);
+
+echo "\nAppend t1 to p:\n";
+$ret = $p->appendChild($t1);
+
+print_node_r($p);
+echo "\n";
+
+echo "t1 == ret: ";
+var_dump( $t1 === $ret );
+
+
+$d = $xml->createElement("div");
+$d->appendChild($t3 = $xml->createTextNode(" t3 "));
+$d->appendChild($b = $xml->createElement("b"));
+$b->appendChild($xml->createElement("X"));
+$d->appendChild($t4 = $xml->createTextNode(" t4 "));
+$d->appendChild($xml->createTextNode(" xxx "));
+
+echo "\ndiv:\n";
+print_node_r($d);
+
+echo "\nInsert t4 before t3:\n";
+
+$ret = $d->insertBefore($t4, $t3);
+
+print_node_r($d);
+echo "\n";
+
+$frag = $xml->createDocumentFragment();
+
+$t5 = $frag->appendChild($xml->createTextNode(" t5 "));
+$frag->appendChild($i = $xml->createElement("i"));
+$i->appendChild($xml->createTextNode(" frob "));
+$frag->appendChild($xml->createTextNOde(" t6 "));
+
+echo "\np:\n";
+print_node_r($p);
+echo "\nFragment:\n";
+print_node_r($frag);
+
+echo "\nAppending fragment to p:\n";
+$p->appendChild($frag);
+
+print_node_r($p);
+echo "\nFragment:\n";
+print_node_r($frag);
+
+echo "\ndiv:\n";
+print_node_r($d);
+echo "\nInserting fragment before t4\n";
+$d->insertBefore($frag, $t4);
+print_node_r($d);
+
+echo "\np:\n";
+print_node_r($p);
+
+?>
+--EXPECT--
+
+name (value): p ( t1 X t2  xxx )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): #text ( t1 )
+  parent: name (value): p ( t1 X t2  xxx )
+  previousSibling: NULL
+  nextSibling: name (value): b (X)
+
+  name (value): b (X)
+  parent: name (value): p ( t1 X t2  xxx )
+  previousSibling: name (value): #text ( t1 )
+  nextSibling: name (value): #text ( t2 )
+
+    name (value): #text (X)
+    parent: name (value): b (X)
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t2 )
+  parent: name (value): p ( t1 X t2  xxx )
+  previousSibling: name (value): b (X)
+  nextSibling: name (value): #text ( xxx )
+
+  name (value): #text ( xxx )
+  parent: name (value): p ( t1 X t2  xxx )
+  previousSibling: name (value): #text ( t2 )
+  nextSibling: NULL
+
+Append t1 to p:
+
+name (value): p (X t2  xxx  t1 )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): b (X)
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t2 )
+
+    name (value): #text (X)
+    parent: name (value): b (X)
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t2 )
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: name (value): b (X)
+  nextSibling: name (value): #text ( xxx )
+
+  name (value): #text ( xxx )
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: name (value): #text ( t2 )
+  nextSibling: name (value): #text ( t1 )
+
+  name (value): #text ( t1 )
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: name (value): #text ( xxx )
+  nextSibling: NULL
+
+t1 == ret: bool(true)
+
+div:
+
+name (value): div ( t3  t4  xxx )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): #text ( t3 )
+  parent: name (value): div ( t3  t4  xxx )
+  previousSibling: NULL
+  nextSibling: name (value): b ()
+
+  name (value): b ()
+  parent: name (value): div ( t3  t4  xxx )
+  previousSibling: name (value): #text ( t3 )
+  nextSibling: name (value): #text ( t4 )
+
+    name (value): X ()
+    parent: name (value): b ()
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t4 )
+  parent: name (value): div ( t3  t4  xxx )
+  previousSibling: name (value): b ()
+  nextSibling: name (value): #text ( xxx )
+
+  name (value): #text ( xxx )
+  parent: name (value): div ( t3  t4  xxx )
+  previousSibling: name (value): #text ( t4 )
+  nextSibling: NULL
+
+Insert t4 before t3:
+
+name (value): div ( t4  t3  xxx )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): #text ( t4 )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t3 )
+
+  name (value): #text ( t3 )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): #text ( t4 )
+  nextSibling: name (value): b ()
+
+  name (value): b ()
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): #text ( t3 )
+  nextSibling: name (value): #text ( xxx )
+
+    name (value): X ()
+    parent: name (value): b ()
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( xxx )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): b ()
+  nextSibling: NULL
+
+
+p:
+
+name (value): p (X t2  xxx  t1 )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): b (X)
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t2 )
+
+    name (value): #text (X)
+    parent: name (value): b (X)
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t2 )
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: name (value): b (X)
+  nextSibling: name (value): #text ( xxx )
+
+  name (value): #text ( xxx )
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: name (value): #text ( t2 )
+  nextSibling: name (value): #text ( t1 )
+
+  name (value): #text ( t1 )
+  parent: name (value): p (X t2  xxx  t1 )
+  previousSibling: name (value): #text ( xxx )
+  nextSibling: NULL
+
+Fragment:
+
+name (value): #document-fragment ()
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): #text ( t5 )
+  parent: name (value): #document-fragment ()
+  previousSibling: NULL
+  nextSibling: name (value): i ( frob )
+
+  name (value): i ( frob )
+  parent: name (value): #document-fragment ()
+  previousSibling: name (value): #text ( t5 )
+  nextSibling: name (value): #text ( t6 )
+
+    name (value): #text ( frob )
+    parent: name (value): i ( frob )
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t6 )
+  parent: name (value): #document-fragment ()
+  previousSibling: name (value): i ( frob )
+  nextSibling: NULL
+
+Appending fragment to p:
+
+name (value): p (X t2  xxx  t1  t5  frob  t6 )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): b (X)
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t2 )
+
+    name (value): #text (X)
+    parent: name (value): b (X)
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t2 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): b (X)
+  nextSibling: name (value): #text ( xxx )
+
+  name (value): #text ( xxx )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( t2 )
+  nextSibling: name (value): #text ( t1 )
+
+  name (value): #text ( t1 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( xxx )
+  nextSibling: name (value): #text ( t5 )
+
+  name (value): #text ( t5 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( t1 )
+  nextSibling: name (value): i ( frob )
+
+  name (value): i ( frob )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( t5 )
+  nextSibling: name (value): #text ( t6 )
+
+    name (value): #text ( frob )
+    parent: name (value): i ( frob )
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t6 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): i ( frob )
+  nextSibling: NULL
+
+Fragment:
+
+name (value): #document-fragment ()
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+div:
+
+name (value): div ( t4  t3  xxx )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): #text ( t4 )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t3 )
+
+  name (value): #text ( t3 )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): #text ( t4 )
+  nextSibling: name (value): b ()
+
+  name (value): b ()
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): #text ( t3 )
+  nextSibling: name (value): #text ( xxx )
+
+    name (value): X ()
+    parent: name (value): b ()
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( xxx )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): b ()
+  nextSibling: NULL
+
+Inserting fragment before t4
+Error (2) on line 109: DOMNode::insertBefore(): Document Fragment is empty
+
+name (value): div ( t4  t3  xxx )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): #text ( t4 )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t3 )
+
+  name (value): #text ( t3 )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): #text ( t4 )
+  nextSibling: name (value): b ()
+
+  name (value): b ()
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): #text ( t3 )
+  nextSibling: name (value): #text ( xxx )
+
+    name (value): X ()
+    parent: name (value): b ()
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( xxx )
+  parent: name (value): div ( t4  t3  xxx )
+  previousSibling: name (value): b ()
+  nextSibling: NULL
+
+p:
+
+name (value): p (X t2  xxx  t1  t5  frob  t6 )
+parent: NULL
+previousSibling: NULL
+nextSibling: NULL
+
+  name (value): b (X)
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: NULL
+  nextSibling: name (value): #text ( t2 )
+
+    name (value): #text (X)
+    parent: name (value): b (X)
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t2 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): b (X)
+  nextSibling: name (value): #text ( xxx )
+
+  name (value): #text ( xxx )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( t2 )
+  nextSibling: name (value): #text ( t1 )
+
+  name (value): #text ( t1 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( xxx )
+  nextSibling: name (value): #text ( t5 )
+
+  name (value): #text ( t5 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( t1 )
+  nextSibling: name (value): i ( frob )
+
+  name (value): i ( frob )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): #text ( t5 )
+  nextSibling: name (value): #text ( t6 )
+
+    name (value): #text ( frob )
+    parent: name (value): i ( frob )
+    previousSibling: NULL
+    nextSibling: NULL
+
+  name (value): #text ( t6 )
+  parent: name (value): p (X t2  xxx  t1  t5  frob  t6 )
+  previousSibling: name (value): i ( frob )
+  nextSibling: NULL