Fix phpGH-16535: UAF when using document as a child

ndossche · ndossche · commit 51b642f2c9dc · 2024-10-21T20:56:14.000+02:00
Documents can never be children of any node. Closes phpGH-16539.
diff --git a/NEWS b/NEWS
@@ -32,6 +32,7 @@ PHP                                                                        NEWS
   . Fixed bug GH-16473 (dom_import_simplexml stub is wrong). (nielsdos)
   . Fixed bug GH-16533 (Segfault when adding attribute to parent that is not
     an element). (nielsdos)
+  . Fixed bug GH-16535 (UAF when using document as a child). (nielsdos)
 
 - EXIF:
   . Fixed bug GH-16409 (Segfault in exif_thumbnail when not dealing with a
diff --git a/ext/dom/node.c b/ext/dom/node.c
@@ -878,6 +878,12 @@ static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNode
 		return false;
 	}
 
+	/* Documents can never be a child. */
+	if (child->type == XML_DOCUMENT_NODE || child->type == XML_HTML_DOCUMENT_NODE) {
+		php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
+		return false;
+	}
+
 	return true;
 }
 
diff --git a/ext/dom/tests/gh16535.phpt b/ext/dom/tests/gh16535.phpt
@@ -0,0 +1,25 @@
+--TEST--
+GH-16535 (UAF when using document as a child)
+--EXTENSIONS--
+dom
+--FILE--
+<?php
+
+$v2 = new DOMDocument("t");
+
+$v2->loadHTML("t");
+$v4 = $v2->createElement('foo');
+try {
+    $v4->appendChild($v2);
+} catch (DOMException $e) {
+    echo $e->getMessage(), "\n";
+}
+$v2->loadHTML("oU");
+echo $v2->saveXML();
+
+?>
+--EXPECT--
+Hierarchy Request Error
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html><body><p>oU</p></body></html>

Original file line number	Diff line number	Diff line change
`@@ -878,6 +878,12 @@ static bool dom_node_check_legacy_insertion_validity(xmlNodePtr parentp, xmlNode`
`878`	`878`	`return false;`
`879`	`879`	`}`
`880`	`880`
	`881`	`+ /* Documents can never be a child. */`
	`882`	`+ if (child->type == XML_DOCUMENT_NODE \|\| child->type == XML_HTML_DOCUMENT_NODE) {`
	`883`	`+ php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);`
	`884`	`+ return false;`
	`885`	`+ }`
	`886`	`+`
`881`	`887`	`return true;`
`882`	`888`	`}`
`883`	`889`