cvs: php4(PHP_4_2_0) /ext/domxml php_domxml.c
| From: | Joseph Tate | Date: | Fri, 08 Mar 2002 23:39:27 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9838@lists.php.net to get a copy of this message | ||
jtate Fri Mar 8 18:39:27 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/ext/domxml php_domxml.c
Log:
- Fixed a coredump involved in the domxml_unlink() function. Refer to bug #14522
for more details.
@ Fixed seg fault in domxml_unlink() (jtate)
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.118.2.3 php4/ext/domxml/php_domxml.c:1.118.2.4
--- php4/ext/domxml/php_domxml.c:1.118.2.3 Thu Mar 7 13:53:55 2002
+++ php4/ext/domxml/php_domxml.c Fri Mar 8 18:39:26 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.118.2.3 2002/03/07 18:53:55 jtate Exp $ */
+/* $Id: php_domxml.c,v 1.118.2.4 2002/03/08 23:39:26 jtate Exp $ */
/* TODO
* - Support Notation Nodes
@@ -1802,8 +1802,12 @@
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 */
}
/* }}} */