Throw on uninitialized SimpleXMLElement

Elevate this warning into an Error, as usual. Add a few checks
in places that were missing them.

diff --git a/ext/simplexml/php_simplexml_exports.h b/ext/simplexml/php_simplexml_exports.h
index 748a59317d8d7162ae14b7bd5a329380824b4a75..13f5e4fb33458efcd0b6c910277a898784346137 100644 (file)
--- a/ext/simplexml/php_simplexml_exports.h
+++ b/ext/simplexml/php_simplexml_exports.h
@@ -31,7 +31,7 @@
                __n = (__s)->node->node; \
        } else { \
                __n = NULL; \
-               php_error_docref(NULL, E_WARNING, "Node no longer exists"); \
+               zend_throw_error(NULL, "SimpleXMLElement is not properly initialized"); \
        } \
 }
 

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 8568a3ffe7128ddea15c06873552506433544bbe..4688fed5b4e7bd050081184e5ad2e7ef36d1ba57 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -82,15 +82,6 @@ static void _node_as_zval(php_sxe_object *sxe, xmlNodePtr node, zval *value, SXE
 }
 /* }}} */
 
-#define GET_NODE(__s, __n) { \
-       if ((__s)->node && (__s)->node->node) { \
-               __n = (__s)->node->node; \
-       } else { \
-               __n = NULL; \
-               php_error_docref(NULL, E_WARNING, "Node no longer exists"); \
-       } \
-}
-
 static xmlNodePtr php_sxe_get_first_node(php_sxe_object *sxe, xmlNodePtr node) /* {{{ */
 {
        php_sxe_object *intern;
@@ -1323,18 +1314,15 @@ SXE_METHOD(xpath)
                return; /* attributes don't have attributes */
        }
 
+       GET_NODE(sxe, nodeptr);
+       nodeptr = php_sxe_get_first_node(sxe, nodeptr);
+       if (!nodeptr) {
+               return;
+       }
+
        if (!sxe->xpath) {
                sxe->xpath = xmlXPathNewContext((xmlDocPtr) sxe->document->ptr);
        }
-       if (!sxe->node) {
-               php_libxml_increment_node_ptr((php_libxml_node_object *)sxe, xmlDocGetRootElement((xmlDocPtr) sxe->document->ptr), NULL);
-               if (!sxe->node) {
-                       RETURN_FALSE;
-               }
-       }
-
-       nodeptr = php_sxe_get_first_node(sxe, sxe->node->node);
-
        sxe->xpath->node = nodeptr;
 
        ns = xmlGetNsList((xmlDocPtr) sxe->document->ptr, nodeptr);
@@ -1599,9 +1587,14 @@ SXE_METHOD(getDocNamespaces)
        }
 
        sxe = Z_SXEOBJ_P(ZEND_THIS);
-       if(from_root){
+       if (from_root) {
+               if (!sxe->document) {
+                       zend_throw_error(NULL, "SimpleXMLElement is not properly initialized");
+                       RETURN_THROWS();
+               }
+
                node = xmlDocGetRootElement((xmlDocPtr)sxe->document->ptr);
-       }else{
+       } else {
                GET_NODE(sxe, node);
        }
 
@@ -1635,6 +1628,9 @@ SXE_METHOD(children)
 
        GET_NODE(sxe, node);
        node = php_sxe_get_first_node(sxe, node);
+       if (!node) {
+               return;
+       }
 
        _node_as_zval(sxe, node, return_value, SXE_ITER_CHILD, NULL, (xmlChar *)nsprefix, isprefix);
 
@@ -1680,13 +1676,15 @@ SXE_METHOD(attributes)
 
        sxe = Z_SXEOBJ_P(ZEND_THIS);
        GET_NODE(sxe, node);
+       node = php_sxe_get_first_node(sxe, node);
+       if (!node) {
+               return;
+       }
 
        if (sxe->iter.type == SXE_ITER_ATTRLIST) {
                return; /* attributes don't have attributes */
        }
 
-       node = php_sxe_get_first_node(sxe, node);
-
        _node_as_zval(sxe, node, return_value, SXE_ITER_ATTRLIST, NULL, (xmlChar *)nsprefix, isprefix);
 }
 /* }}} */

diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
index 3eb417cef28003d0492850867fc3921aa3223d57..cb66922d7030f65efa648ec500e8a50a5ae92b96 100644 (file)
--- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
+++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt
@@ -11,7 +11,11 @@ const XML_PARSE_RECOVER = 1;
 $xml = @simplexml_load_string("XXXXXXX^", 'SimpleXMLElement', XML_PARSE_RECOVER);
 
 // $xml is supposed to hold a SimpleXMLElement, but not FALSE/NULL
-var_dump($xml->xpath("BBBB"));
+try {
+    var_dump($xml->xpath("BBBB"));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
 --EXPECT--
-bool(false)
+SimpleXMLElement is not properly initialized

diff --git a/ext/simplexml/tests/simplexml_uninitialized.phpt b/ext/simplexml/tests/simplexml_uninitialized.phpt
new file mode 100644 (file)
index 0000000..9361f23
--- /dev/null
+++ b/ext/simplexml/tests/simplexml_uninitialized.phpt
@@ -0,0 +1,51 @@
+--TEST--
+Incorrectly initialized SimpleXmlElement
+--FILE--
+<?php
+
+class MySXE extends SimpleXMLElement {
+    public function __construct() {
+        /* yolo */
+    }
+}
+
+$sxe = new MySXE;
+try {
+    var_dump($sxe->count());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($sxe->xpath(''));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($sxe->getDocNamespaces());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($sxe->children());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($sxe->attributes());
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($sxe->foo);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+SimpleXMLElement is not properly initialized
+SimpleXMLElement is not properly initialized
+SimpleXMLElement is not properly initialized
+SimpleXMLElement is not properly initialized
+SimpleXMLElement is not properly initialized
+SimpleXMLElement is not properly initialized