php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  NEWS
  Fix bug #81325  Segfault in zif_simplexml_import_dom
This commit is contained in:
Remi Collet
2021-08-03 12:08:03 +02:00
parent 467504c952 35c3e0b1a4
commit a48bf8a0b9
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/simplexml/simplexml.c
View File

@@ -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;

19
ext/simplexml/tests/bug81325.phpt Normal file
View File

@@ -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