Merge branch 'PHP-8.3'

* PHP-8.3: Fix registerNodeClass with abstract class crashing
jamlee-t · Oct 13, 2023 · 3ff3199 · 3ff3199
2 parents 82c2143 + f5d1a19
commit 3ff3199
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/ext/dom/document.c b/ext/dom/document.c
@@ -2072,6 +2072,10 @@ PHP_METHOD(DOMDocument, registerNodeClass)
 	}
 
 	if (ce == NULL || instanceof_function(ce, basece)) {
+		if (UNEXPECTED(ce != NULL && (ce->ce_flags & ZEND_ACC_ABSTRACT))) {
+			zend_argument_value_error(2, "must not be an abstract class");
+			RETURN_THROWS();
+		}
 		DOM_GET_THIS_INTERN(intern);
 		dom_set_doc_classmap(intern->document, basece, ce);
 		RETURN_TRUE;

diff --git a/ext/dom/tests/registerNodeClass_abstract_class.phpt b/ext/dom/tests/registerNodeClass_abstract_class.phpt
@@ -0,0 +1,24 @@
+--TEST--
+registerNodeClass() with an abstract class should fail
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+abstract class Test extends DOMElement {
+    abstract function foo();
+}
+
+$dom = new DOMDocument;
+
+try {
+    $dom->registerNodeClass("DOMElement", "Test");
+} catch (ValueError $e) {
+    echo "ValueError: ", $e->getMessage(), "\n";
+}
+
+$dom->createElement("foo");
+
+?>
+--EXPECT--
+ValueError: DOMDocument::registerNodeClass(): Argument #2 ($extendedClass) must not be an abstract class