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

Remove nonsensical dom_node_children_valid() checks from parentnode.c (#14706)

Browse Source 
Either these are for ParentNode, which are always valid parents that can
hold children. Or these are for ChildNode, which always has a parent
that can have children (by definition).
This commit is contained in:
Niels Dossche
2024-06-29 07:55:18 -07:00
committed by GitHub
parent 58a6e5551e
commit 998997b6a1
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ext/dom/parentnode.c
View File

@@ -35,13 +35,10 @@ zend_result dom_parent_node_first_element_child_read(dom_object *obj, zval *retv
{
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
xmlNodePtr first = NULL;
if (dom_node_children_valid(nodep)) {
first = nodep->children;
xmlNodePtr first = nodep->children;
while (first && first->type != XML_ELEMENT_NODE) {
first = first->next;
}
while (first && first->type != XML_ELEMENT_NODE) {
first = first->next;
}
if (!first) {
@@ -62,13 +59,10 @@ zend_result dom_parent_node_last_element_child_read(dom_object *obj, zval *retva
{
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
xmlNodePtr last = NULL;
if (dom_node_children_valid(nodep)) {
last = nodep->last;
xmlNodePtr last = nodep->last;
while (last && last->type != XML_ELEMENT_NODE) {
last = last->prev;
}
while (last && last->type != XML_ELEMENT_NODE) {
last = last->prev;
}
if (!last) {
@@ -90,16 +84,14 @@ zend_result dom_parent_node_child_element_count(dom_object *obj, zval *retval)
DOM_PROP_NODE(xmlNodePtr, nodep, obj);
zend_long count = 0;
if (dom_node_children_valid(nodep)) {
xmlNodePtr first = nodep->children;
xmlNodePtr first = nodep->children;
while (first != NULL) {
if (first->type == XML_ELEMENT_NODE) {
count++;
}
first = first->next;
while (first != NULL) {
if (first->type == XML_ELEMENT_NODE) {
count++;
}
first = first->next;
}
ZVAL_LONG(retval, count);
@@ -704,10 +696,6 @@ static zend_result dom_child_removal_preconditions(const xmlNode *child, int str
return FAILURE;
}
if (!dom_node_children_valid(child->parent)) {
return FAILURE;
}
xmlNodePtr children = child->parent->children;
if (!children) {
php_dom_throw_error(NOT_FOUND_ERR, stricterror);