Commented out a few lines that were causing a segfault in the unlink code.

This fixes bug #14522.  I've tested that it does not cause a segfault under
RH 7.2, and retains all functionality.  I recommend that this patch be
considered for the PHP_4_2_0 tree as well, as having a function that core
dumps every time is a bad thing(TM).

diff --git a/ext/domxml/php_domxml.c b/ext/domxml/php_domxml.c
index b138bec17307d50ab558b09baf24ad6d50d4cf57..2774755ec3998e7517852a5e313e565f9c255562 100644 (file)
--- a/ext/domxml/php_domxml.c
+++ b/ext/domxml/php_domxml.c
@@ -1802,8 +1802,12 @@ PHP_FUNCTION(domxml_node_unlink_node)
        DOMXML_PARAM_NONE(nodep, id, le_domxmlnodep);
 
        xmlUnlinkNode(nodep);
-       xmlFreeNode(nodep);
-       zval_dtor(id);                          /* This is not enough because the children won't be deleted */
+       /*      This causes a Segmentation Fault for some reason.  Removing 
+               it allows the user to re-add the node at some other time, in
+               addition to fixing the segfault.  Node will be freed at
+               shutdown. */
+       /*xmlFreeNode(nodep);
+       zval_dtor(id);*/                        /* This is not enough because the children won't be deleted */
 }
 /* }}} */