diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-03-15 10:26:50 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-03-17 12:37:18 +0100 |
| commit | a08847ab39bb512d500cf196981a3e8780c83600 (patch) | |
| tree | 70219b3bf0b7f8f0b90d7fcc8846d7bd174cf258 /ext | |
| parent | 4adc08a403fe6784af0ca91c7743c3b5c44763a4 (diff) | |
| download | php-git-a08847ab39bb512d500cf196981a3e8780c83600.tar.gz | |
Fix #66783: UAF when appending DOMDocument to element
According to the DOM standard, elements may only contain element, text,
processing instruction and comment nodes[1]. It is also specified that
a HierarchyRequestError should be thrown if a document is to be
inserted[2]. We follow that standard, and prevent the use-after-free
this way.
[1] <https://dom.spec.whatwg.org/#node-trees>
[2] <https://dom.spec.whatwg.org/#mutation-algorithms>
Closes GH-6765.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dom/php_dom.c | 10 | ||||
| -rw-r--r-- | ext/dom/tests/bug66783.phpt | 19 |
2 files changed, 26 insertions, 3 deletions
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 |