Skip to content

Commit a025e6c

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Fix registerNodeClass with abstract class crashing
2 parents 90c9ec1 + d7de0ce commit a025e6c

File tree

3 files changed

+31
-0
lines changed

3 files changed

+31
-0
lines changed

NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ PHP NEWS
55
- Core:
66
. Fixed double-free of non-interned enum case name. (ilutov)
77

8+
- DOM:
9+
. Fix registerNodeClass with abstract class crashing. (nielsdos)
10+
811
- Fiber:
912
. Fixed bug GH-11121 (ReflectionFiber segfault). (danog, trowski, bwoebi)
1013

ext/dom/document.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2096,6 +2096,10 @@ PHP_METHOD(DOMDocument, registerNodeClass)
20962096
}
20972097

20982098
if (ce == NULL || instanceof_function(ce, basece)) {
2099+
if (UNEXPECTED(ce != NULL && (ce->ce_flags & ZEND_ACC_ABSTRACT))) {
2100+
zend_argument_value_error(2, "must not be an abstract class");
2101+
RETURN_THROWS();
2102+
}
20992103
DOM_GET_OBJ(docp, id, xmlDocPtr, intern);
21002104
dom_set_doc_classmap(intern->document, basece, ce);
21012105
RETURN_TRUE;
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--TEST--
2+
registerNodeClass() with an abstract class should fail
3+
--EXTENSIONS--
4+
dom
5+
--FILE--
6+
<?php
7+
8+
abstract class Test extends DOMElement {
9+
abstract function foo();
10+
}
11+
12+
$dom = new DOMDocument;
13+
14+
try {
15+
$dom->registerNodeClass("DOMElement", "Test");
16+
} catch (ValueError $e) {
17+
echo "ValueError: ", $e->getMessage(), "\n";
18+
}
19+
20+
$dom->createElement("foo");
21+
22+
?>
23+
--EXPECT--
24+
ValueError: DOMDocument::registerNodeClass(): Argument #2 ($extendedClass) must not be an abstract class

0 commit comments

Comments
 (0)