archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Fix #79271: DOMDocumentType::$childNodes is NULL
This commit is contained in:
Christoph M. Becker 2020-02-17 09:09:12 +01:00
commit 73a4c50309
4 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -20,6 +20,7 @@ PHP NEWS
- DOM: - DOM:
. Fixed bug #77569: (Write Access Violation in DomImplementation). (Nikita, . Fixed bug #77569: (Write Access Violation in DomImplementation). (Nikita,
cmb) cmb)
. Fixed bug #79271 (DOMDocumentType::$childNodes is NULL). (cmb)
- PCRE: - PCRE:
. Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback . Fixed bug #79188 (Memory corruption in preg_replace/preg_replace_callback

10
ext/dom/node.c
View file

@ -431,13 +431,9 @@ int dom_node_child_nodes_read(dom_object *obj, zval *retval)
return FAILURE; return FAILURE;
} }
if (dom_node_children_valid(nodep) == FAILURE) { php_dom_create_interator(retval, DOM_NODELIST);
ZVAL_NULL(retval); intern = Z_DOMOBJ_P(retval);
} else { dom_namednode_iter(obj, XML_ELEMENT_NODE, intern, NULL, NULL, NULL);
php_dom_create_interator(retval, DOM_NODELIST);
intern = Z_DOMOBJ_P(retval);
dom_namednode_iter(obj, XML_ELEMENT_NODE, intern, NULL, NULL, NULL);
}
return SUCCESS; return SUCCESS;
} }

4
ext/dom/tests/bug69846.phpt
View file

@ -50,7 +50,7 @@ object(DOMText)#%d (19) {
["parentNode"]=> ["parentNode"]=>
NULL NULL
["childNodes"]=> ["childNodes"]=>
NULL string(22) "(object value omitted)"
["firstChild"]=> ["firstChild"]=>
NULL NULL
["lastChild"]=> ["lastChild"]=>
@ -140,7 +140,7 @@ object(DOMText)#%d (19) {
["parentNode"]=> ["parentNode"]=>
NULL NULL
["childNodes"]=> ["childNodes"]=>
NULL string(22) "(object value omitted)"
["firstChild"]=> ["firstChild"]=>
NULL NULL
["lastChild"]=> ["lastChild"]=>

17
ext/dom/tests/bug79271.phpt Normal file
View file

@ -0,0 +1,17 @@
--TEST--
Bug #79271 (DOMDocumentType::$childNodes is NULL)
--SKIPIF--
<?php
if (!extension_loaded('dom')) die('skip dom extension not available');
?>
--FILE--
<?php
$dom = new DOMImplementation();
$type = $dom->createDocumentType('html');
var_dump($type->childNodes);
?>
--EXPECTF--
object(DOMNodeList)#%d (1) {
["length"]=>
int(0)
}