Skip to content

Commit 406c5d5

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix #79271: DOMDocumentType::$childNodes is NULL
2 parents 7d0102d + 73a4c50 commit 406c5d5

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

ext/dom/node.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -327,13 +327,9 @@ int dom_node_child_nodes_read(dom_object *obj, zval *retval)
327327
return FAILURE;
328328
}
329329

330-
if (dom_node_children_valid(nodep) == FAILURE) {
331-
ZVAL_NULL(retval);
332-
} else {
333-
php_dom_create_interator(retval, DOM_NODELIST);
334-
intern = Z_DOMOBJ_P(retval);
335-
dom_namednode_iter(obj, XML_ELEMENT_NODE, intern, NULL, NULL, NULL);
336-
}
330+
php_dom_create_interator(retval, DOM_NODELIST);
331+
intern = Z_DOMOBJ_P(retval);
332+
dom_namednode_iter(obj, XML_ELEMENT_NODE, intern, NULL, NULL, NULL);
337333

338334
return SUCCESS;
339335
}

ext/dom/tests/bug69846.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ object(DOMText)#%d (19) {
4949
["parentNode"]=>
5050
NULL
5151
["childNodes"]=>
52-
NULL
52+
string(22) "(object value omitted)"
5353
["firstChild"]=>
5454
NULL
5555
["lastChild"]=>
@@ -139,7 +139,7 @@ object(DOMText)#%d (19) {
139139
["parentNode"]=>
140140
NULL
141141
["childNodes"]=>
142-
NULL
142+
string(22) "(object value omitted)"
143143
["firstChild"]=>
144144
NULL
145145
["lastChild"]=>

ext/dom/tests/bug79271.phpt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
--TEST--
2+
Bug #79271 (DOMDocumentType::$childNodes is NULL)
3+
--SKIPIF--
4+
<?php
5+
if (!extension_loaded('dom')) die('skip dom extension not available');
6+
?>
7+
--FILE--
8+
<?php
9+
$dom = new DOMImplementation();
10+
$type = $dom->createDocumentType('html');
11+
var_dump($type->childNodes);
12+
?>
13+
--EXPECTF--
14+
object(DOMNodeList)#%d (1) {
15+
["length"]=>
16+
int(0)
17+
}

0 commit comments

Comments
 (0)