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

Fix GH-21486: Dom\HTMLDocument parser mangles xml:space and xml:lang attributes

Browse Source 
Closes GH-21489.
This commit is contained in:
ndossche
2026-03-21 22:57:06 +01:00
parent c52cfaf88b
commit c920daa7ec
3 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -9,6 +9,10 @@ PHP NEWS
. Fixed bugs GH-20875, GH-20873, GH-20854 (Propagate IN_GET guard in . Fixed bugs GH-20875, GH-20873, GH-20854 (Propagate IN_GET guard in
get_property_ptr_ptr for lazy proxies). (iliaal) get_property_ptr_ptr for lazy proxies). (iliaal)
- DOM:
. Fixed bug GH-21486 (Dom\HTMLDocument parser mangles xml:space and
xml:lang attributes). (ndossche)
- GD: - GD:
. Fixed bug GH-21431 (phpinfo() to display libJPEG 10.0 support). . Fixed bug GH-21431 (phpinfo() to display libJPEG 10.0 support).
(David Carlier) (David Carlier)

7
ext/dom/html5_parser.c
View File

@@ -117,6 +117,7 @@ static lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert(
php_dom_libxml_ns_mapper *ns_mapper = php_dom_ns_mapper_from_private(private_data); php_dom_libxml_ns_mapper *ns_mapper = php_dom_ns_mapper_from_private(private_data);
xmlNsPtr html_ns = php_dom_libxml_ns_mapper_ensure_html_ns(ns_mapper); xmlNsPtr html_ns = php_dom_libxml_ns_mapper_ensure_html_ns(ns_mapper);
xmlNsPtr xlink_ns = NULL; xmlNsPtr xlink_ns = NULL;
xmlNsPtr xml_ns = NULL;
xmlNsPtr prefixed_xmlns_ns = NULL; xmlNsPtr prefixed_xmlns_ns = NULL;
lexbor_array_obj_t work_list; lexbor_array_obj_t work_list;
@@ -256,6 +257,12 @@ static lexbor_libxml2_bridge_status lexbor_libxml2_bridge_convert(
xlink_ns->_private = (void *) php_dom_ns_is_xlink_magic_token; xlink_ns->_private = (void *) php_dom_ns_is_xlink_magic_token;
} }
lxml_attr->ns = xlink_ns; lxml_attr->ns = xlink_ns;
} else if (attr->node.ns == LXB_NS_XML) {
if (xml_ns == NULL) {
xml_ns = php_dom_libxml_ns_mapper_get_ns_raw_strings_nullsafe(ns_mapper, "xml", DOM_XML_NS_URI);
xml_ns->_private = (void *) php_dom_ns_is_xml_magic_token;
}
lxml_attr->ns = xml_ns;
} }
if (last_added_attr == NULL) { if (last_added_attr == NULL) {

18
ext/dom/tests/modern/html/parser/gh21486.phpt Normal file
View File

@@ -0,0 +1,18 @@
--TEST--
GH-21486 (Dom\HTMLDocument parser mangles xml:space and xml:lang attributes)
--EXTENSIONS--
dom
--CREDITS--
JKingweb
--FILE--
<?php
$d = @\Dom\HTMLDocument::createFromString("<div></div>");
$e = $d->getElementsByTagName("div")[0];
$e->innerHTML = '<svg xml:space="default" xlink:href="about:blank" xmlns:foo="barspace"></svg>';
$svg = $d->querySelector("svg");
echo $e->innerHTML."\n";
echo $svg->attributes[0]->localName." ".var_export($svg->attributes[0]->namespaceURI, true)."\n";
?>
--EXPECT--
<svg xml:space="default" xlink:href="about:blank" xmlns:foo="barspace"></svg>
space 'http://www.w3.org/XML/1998/namespace'