diff options
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | ext/dom/php_dom.c | 10 | ||||
-rw-r--r-- | ext/dom/tests/bug66783.phpt | 19 |
3 files changed, 28 insertions, 3 deletions
@@ -2,6 +2,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2021, PHP 7.4.18 +- DOM: + . Fixed bug #66783 (UAF when appending DOMDocument to element). (cmb) 01 Apr 2021, PHP 7.4.17 diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 6bc72e9f97..2f2878d5e1 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -1302,9 +1302,13 @@ int dom_hierarchy(xmlNodePtr parent, xmlNodePtr child) { xmlNodePtr nodep; - if (parent == NULL || child == NULL || child->doc != parent->doc) { - return SUCCESS; - } + if (parent == NULL || child == NULL || child->doc != parent->doc) { + return SUCCESS; + } + + if (child->type == XML_DOCUMENT_NODE) { + return FAILURE; + } nodep = parent; diff --git a/ext/dom/tests/bug66783.phpt b/ext/dom/tests/bug66783.phpt new file mode 100644 index 0000000000..98981a88f6 --- /dev/null +++ b/ext/dom/tests/bug66783.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #66783 (UAF when appending DOMDocument to element) +--SKIPIF-- +<?php +if (!extension_loaded('dom')) die('skip dom extension not available'); +?> +--FILE-- +<?php +$doc = new DomDocument; +$doc->loadXML('<root></root>'); +$e = $doc->createElement('e'); +try { + $e->appendChild($doc); +} catch (DOMException $ex) { + echo $ex->getMessage(), PHP_EOL; +} +?> +--EXPECTF-- +Hierarchy Request Error |