cvs: php4(PHP_4_3) /ext/domxml php_domxml.c
| From: | Christian Stocker | Date: | Mon, 06 Jan 2003 08:48:39 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17666@lists.php.net to get a copy of this message | ||
chregu Mon Jan 6 03:48:39 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/domxml php_domxml.c
Log:
partly MFH from 1.288 (Fixed segfault, when trying to add a node to itself)
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.218.2.5 php4/ext/domxml/php_domxml.c:1.218.2.6
--- php4/ext/domxml/php_domxml.c:1.218.2.5 Tue Dec 31 11:34:25 2002
+++ php4/ext/domxml/php_domxml.c Mon Jan 6 03:48:38 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.5 2002/12/31 16:34:25 sebastian Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.6 2003/01/06 08:48:38 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -2294,6 +2294,12 @@
if (child->type == XML_ATTRIBUTE_NODE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't append attribute node");
+ RETURN_FALSE;
+ }
+
+ /* XXX:ls */
+ if (child == parent) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't append node to itself");
RETURN_FALSE;
}