Skip to content

Fix incorrect error handling in dom_zvals_to_fragment() #10981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix incorrect error handling in dom_zvals_to_fragment() #10981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 13 additions & 20 deletions ext/dom/parentnode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,8 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
newNode = dom_object_get_node(newNodeObj);

if (newNode->doc != documentNode) {
xmlFree(fragment);
php_dom_throw_error(WRONG_DOCUMENT_ERR, stricterror);
return NULL;
goto err;
}

if (newNode->parent != NULL) {
Expand All @@ -175,10 +174,7 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
xmlSetTreeDoc(newNode, documentNode);

if (newNode->type == XML_ATTRIBUTE_NODE) {
xmlFree(fragment);

php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
return NULL;
goto hierarchy_request_err;
}

/*
Expand All @@ -191,42 +187,39 @@ xmlNode* dom_zvals_to_fragment(php_libxml_ref_obj *document, xmlNode *contextNod
}

if (!xmlAddChild(fragment, newNode)) {
xmlFree(fragment);
if (nodesc > 1) {
xmlFreeNode(newNode);
}

php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
return NULL;
goto hierarchy_request_err;
}

continue;
} else {
xmlFree(fragment);

zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodes[i]));
return NULL;
goto err;
}
} else if (Z_TYPE(nodes[i]) == IS_STRING) {
newNode = xmlNewDocText(documentNode, (xmlChar *) Z_STRVAL(nodes[i]));

xmlSetTreeDoc(newNode, documentNode);

if (!xmlAddChild(fragment, newNode)) {
xmlFree(fragment);

return NULL;
xmlFreeNode(newNode);
goto hierarchy_request_err;
}
} else {
xmlFree(fragment);

zend_argument_type_error(i + 1, "must be of type DOMNode|string, %s given", zend_zval_type_name(&nodes[i]));

return NULL;
goto err;
}
}

return fragment;

hierarchy_request_err:
php_dom_throw_error(HIERARCHY_REQUEST_ERR, stricterror);
err:
xmlFreeNode(fragment);
return NULL;
}

static void dom_fragment_assign_parent_node(xmlNodePtr parentNode, xmlNodePtr fragment)
Expand Down