Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix phpGH-16316: DOMXPath breaks when not initialized properly

NEWS

@@ -9,6 +9,10 @@ PHP NEWS
  . Fixed bug GH-16302 (CurlMultiHandle holds a reference to CurlHandle if
  curl_multi_add_handle fails). (timwolla)
 
+- DOM:
+ . Fixed bug GH-16316 (DOMXPath breaks when not initialized properly).
+ (nielsdos)
+
 - PHPDBG:
  . Fixed bug GH-16174 (Empty string is an invalid expression for ev). (cmb)
 

ext/dom/tests/gh16316.phpt

@@ -0,0 +1,32 @@
+--TEST--
+GH-16316 (DOMXPath breaks when not initialized properly)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+class Demo extends DOMXPath {
+ public function __construct() {}
+}
+
+$demo = new Demo;
+try {
+ var_dump($demo);
+} catch (DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+
+try {
+ var_dump($demo->document);
+} catch (DOMException $e) {
+ echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+object(Demo)#1 (1) {
+ ["registerNodeNamespaces"]=>
+ bool(true)
+}
+Invalid State Error
+Invalid State Error

ext/dom/xpath.c

@@ -264,6 +264,11 @@ int dom_xpath_document_read(dom_object *obj, zval *retval)
  docp = (xmlDocPtr) ctx->doc;
  }
 
+ if (UNEXPECTED(!docp)) {
+ php_dom_throw_error(INVALID_STATE_ERR, /* strict */ true);
+ return FAILURE;
+ }
+
  php_dom_create_object((xmlNodePtr) docp, retval, obj);
  return SUCCESS;
 }