cvs: php4(PHP_4_3) /ext/domxml php_domxml.c
| From: | Christian Stocker | Date: | Fri, 10 Jan 2003 18:05:03 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/domxml php_domxml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17789@lists.php.net to get a copy of this message | ||
chregu Fri Jan 10 13:05:03 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/domxml php_domxml.c
Log:
Throw error if object is not a XML_DOCUMENT_NODE
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.218.2.7 php4/ext/domxml/php_domxml.c:1.218.2.8
--- php4/ext/domxml/php_domxml.c:1.218.2.7 Mon Jan 6 05:00:34 2003
+++ php4/ext/domxml/php_domxml.c Fri Jan 10 13:05:02 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.218.2.7 2003/01/06 10:00:34 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.218.2.8 2003/01/10 18:05:02 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -3685,6 +3685,11 @@
if (Z_TYPE_P(elementp) == XML_DOCUMENT_NODE || Z_TYPE_P(elementp) == XML_HTML_DOCUMENT_NODE ) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot dump element with a document
node");
+ RETURN_FALSE;
+ }
+
+ if (docp->type != XML_DOCUMENT_NODE && docp->type != XML_HTML_DOCUMENT_NODE) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Object has to be a DomDocument Node");
RETURN_FALSE;
}