Skip to content

Fix GH-16465: Heap buffer overflow in DOMNode->getElementByTagName #16467

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 GH-16465: Heap buffer overflow in DOMNode->getElementByTagName #16467

Show file tree
Hide file tree
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
19 changes: 17 additions & 2 deletions ext/dom/element.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,12 @@ static void dom_element_get_elements_by_tag_name(INTERNAL_FUNCTION_PARAMETERS, b
dom_object *intern, *namednode;
char *name;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &name_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &name, &name_len) == FAILURE) {
RETURN_THROWS();
}

if (name_len > INT_MAX) {
zend_argument_value_error(1, "is too long");
RETURN_THROWS();
}

Expand Down Expand Up @@ -1239,7 +1244,17 @@ static void dom_element_get_elements_by_tag_name_ns(INTERNAL_FUNCTION_PARAMETERS
dom_object *intern, *namednode;
char *uri, *name;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "s!s", &uri, &uri_len, &name, &name_len) == FAILURE) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p!p", &uri, &uri_len, &name, &name_len) == FAILURE) {
RETURN_THROWS();
}

if (uri_len > INT_MAX) {
zend_argument_value_error(1, "is too long");
RETURN_THROWS();
}

if (name_len > INT_MAX) {
zend_argument_value_error(2, "is too long");
RETURN_THROWS();
}

Expand Down
10 changes: 3 additions & 7 deletions ext/dom/php_dom.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,23 +1473,19 @@ void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xml
const xmlChar* tmp;

if (local) {
int len = local_len > INT_MAX ? -1 : (int) local_len;
int len = (int) local_len;
if (doc != NULL && (tmp = xmlDictExists(doc->dict, (const xmlChar *)local, len)) != NULL) {
mapptr->local = BAD_CAST tmp;
} else {
mapptr->local = xmlCharStrndup(local, len);
mapptr->free_local = true;
}
mapptr->local_lower = BAD_CAST estrdup(local);
if (len < 0) {
zend_str_tolower((char *) mapptr->local_lower, strlen((const char *) mapptr->local_lower));
} else {
zend_str_tolower((char *) mapptr->local_lower, len);
}
zend_str_tolower((char *) mapptr->local_lower, len);
}

if (ns) {
int len = ns_len > INT_MAX ? -1 : (int) ns_len;
int len = (int) ns_len;
if (doc != NULL && (tmp = xmlDictExists(doc->dict, (const xmlChar *)ns, len)) != NULL) {
mapptr->ns = BAD_CAST tmp;
} else {
Expand Down
29 changes: 29 additions & 0 deletions ext/dom/tests/gh16465.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--TEST--
GH-16465 (Heap buffer overflow in DOMNode->getElementByTagName)
--EXTENSIONS--
dom
--FILE--
<?php

$v10 = new DOMElement("a");
try {
$v10->getElementsByTagName("text\0something");
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}
try {
$v10->getElementsByTagNameNS("", "text\0something");
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}
try {
$v10->getElementsByTagNameNS("text\0something", "");
} catch (ValueError $e) {
echo $e->getMessage(), "\n";
}

?>
--EXPECT--
DOMElement::getElementsByTagName(): Argument #1 ($qualifiedName) must not contain any null bytes
DOMElement::getElementsByTagNameNS(): Argument #2 ($localName) must not contain any null bytes
DOMElement::getElementsByTagNameNS(): Argument #1 ($namespace) must not contain any null bytes
Loading