Add a missing null check in simplexml

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 4688fed5b4e7bd050081184e5ad2e7ef36d1ba57..afd655aeedd736c4f0a14d0e1d0041bdf4a8efbd 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -1390,6 +1390,11 @@ SXE_METHOD(registerXPathNamespace)
        }
 
        sxe = Z_SXEOBJ_P(ZEND_THIS);
+       if (!sxe->document) {
+               zend_throw_error(NULL, "SimpleXMLElement is not properly initialized");
+               RETURN_THROWS();
+       }
+
        if (!sxe->xpath) {
                sxe->xpath = xmlXPathNewContext((xmlDocPtr) sxe->document->ptr);
        }

diff --git a/ext/simplexml/tests/simplexml_uninitialized.phpt b/ext/simplexml/tests/simplexml_uninitialized.phpt
index 9361f232a10956434dc54cc8f08b19879151e23a..0c6cfd1e1e05ce554c630eb425bd984f7e9838ec 100644 (file)
--- a/ext/simplexml/tests/simplexml_uninitialized.phpt
+++ b/ext/simplexml/tests/simplexml_uninitialized.phpt
@@ -35,6 +35,11 @@ try {
 } catch (Error $e) {
     echo $e->getMessage(), "\n";
 }
+try {
+    var_dump($sxe->registerXPathNamespace('', ''));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 try {
     var_dump($sxe->foo);
 } catch (Error $e) {
@@ -49,3 +54,4 @@ 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