Skip to content

ext/dom: Fix double-free of namespaces on OOM during parsing. #22539

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

Draft
devnexen wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −4
Draft

ext/dom: Fix double-free of namespaces on OOM during parsing. #22539

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
7 changes: 3 additions & 4 deletions ext/dom/namespace_compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,12 @@ PHP_DOM_EXPORT void php_dom_ns_compat_mark_attribute_list(php_dom_libxml_ns_mapp
xmlNsPtr ns = node->nsDef;
xmlAttrPtr last_added = NULL;
do {
last_added = php_dom_ns_compat_mark_attribute(mapper, node, ns);
php_dom_libxml_ns_mapper_store_and_normalize_parsed_ns(mapper, ns);
xmlNsPtr next = ns->next;
node->nsDef = next;
ns->next = NULL;
php_libxml_set_old_ns(node->doc, ns);
last_added = php_dom_ns_compat_mark_attribute(mapper, node, ns);
php_dom_libxml_ns_mapper_store_and_normalize_parsed_ns(mapper, ns);
ns = next;
} while (ns != NULL);

Expand All @@ -264,8 +265,6 @@ PHP_DOM_EXPORT void php_dom_ns_compat_mark_attribute_list(php_dom_libxml_ns_mapp
/* Nothing added, so nothing changed. Only really possible on OOM. */
node->properties = attr;
}

node->nsDef = NULL;
}

PHP_DOM_EXPORT bool php_dom_ns_is_fast_ex(xmlNsPtr ns, const php_dom_ns_magic_token *magic_token)
Expand Down
Loading