Merge branch 'PHP-8.0'

* PHP-8.0: NEWS Fix bug #81325 Segfault in zif_simplexml_import_dom
MarcusSchwarz · Aug 3, 2021 · a48bf8a · a48bf8a
2 parents 467504c + 35c3e0b
commit a48bf8a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
@@ -2619,7 +2619,7 @@ PHP_FUNCTION(simplexml_import_dom)
 		nodep = xmlDocGetRootElement((xmlDocPtr) nodep);
 	}
 
-	if (nodep->type == XML_ELEMENT_NODE) {
+	if (nodep && nodep->type == XML_ELEMENT_NODE) {
 		if (!ce) {
 			ce = sxe_class_entry;
 			fptr_count = NULL;

diff --git a/ext/simplexml/tests/bug81325.phpt b/ext/simplexml/tests/bug81325.phpt
@@ -0,0 +1,19 @@
+--TEST--
+BUg #81325 (segfault in zif_simplexml_import_dom)
+--SKIPIF--
+<?php
+if (!extension_loaded('simplexml')) die('skip simplexml not available');
+if (!extension_loaded('dom')) die('skip simplexml not available');
+?>
+--FILE--
+<?php
+$dom = new DOMDocument;
+$dom->loadXML("foo");
+$xml = simplexml_import_dom($dom);
+?>
+Done
+--EXPECTF--
+Warning: DOMDocument::loadXML(): Start tag expected%s
+
+Warning: simplexml_import_dom(): Invalid Nodetype%s
+Done