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

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  Fix GH-20395: \Dom\ParentNode::querySelector and \Dom\ParentNode::querySelectorAll requires elements in $selectors to be lowercase (#20409)
This commit is contained in:
Niels Dossche
2025-11-12 19:34:41 +01:00
parent 86b0a2a2b0 3ad5799f25
commit f996abde33
5 changed files with 96 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -10,6 +10,8 @@ PHP NEWS
- DOM:
. Fix memory leak when edge case is hit when registering xpath callback.
(ndossche)
. Fixed bug GH-20395 (querySelector and querySelectorAll requires elements
in $selectors to be lowercase). (ndossche)
- Opcache:
. Fixed bug GH-20329 (opcache.file_cache broken with full interned string

96
ext/dom/lexbor/selectors-adapted/selectors.c
View File

@@ -35,7 +35,22 @@ static void dom_lxb_str_wrapper_release(dom_lxb_str_wrapper *wrapper)
}
}
static zend_always_inline bool lxb_selectors_adapted_cmp_local_name_literal(const xmlNode *node, const char *name)
static bool lxb_selectors_str_cmp_loright(const char *lhs, const char *rhs)
{
while (true) {
if (*rhs != zend_tolower_ascii(*lhs)) {
return false;
}
if (!*lhs) {
return true;
}
++rhs;
++lhs;
}
}
/* `name` is lowercase */
static zend_always_inline bool lxb_selectors_cmp_html_name_lit(const xmlNode *node, const char *name)
{
return strcmp((const char *) node->name, name) == 0;
}
@@ -48,14 +63,15 @@ static zend_always_inline bool lxb_selectors_adapted_cmp_ns(const xmlNode *a, co
static zend_always_inline bool lxb_selectors_adapted_cmp_local_name_id(const xmlNode *node, const lxb_selectors_adapted_id *id)
{
uintptr_t ptr = (uintptr_t) node->name;
if (id->interned && (ptr & (ZEND_MM_ALIGNMENT - 1)) != 0) {
/* It cannot be a heap-allocated string because the pointer is not properly aligned for a heap allocation.
* Therefore, it must be interned into the dictionary pool. */
return node->name == id->name;
ZEND_ASSERT(node->doc != NULL);
if (php_dom_ns_is_html_and_document_is_html(node)) {
/* From https://html.spec.whatwg.org/#case-sensitivity-of-selectors:
* The element name must be compared case sensitively _after_ converting the selector to lowercase.
* E.g. selector "DIV" must match element "div" but not "Div". */
return lxb_selectors_str_cmp_loright((const char *) id->name, (const char *) node->name);
} else {
return strcmp((const char *) node->name, (const char *) id->name) == 0;
}
return strcmp((const char *) node->name, (const char *) id->name) == 0;
}
static zend_always_inline const xmlAttr *lxb_selectors_adapted_attr(const xmlNode *node, const lxb_char_t *name)
@@ -64,9 +80,8 @@ static zend_always_inline const xmlAttr *lxb_selectors_adapted_attr(const xmlNod
ZEND_ASSERT(node->doc != NULL);
if (php_dom_ns_is_html_and_document_is_html(node)) {
/* No need to handle DTD entities as we're in HTML. */
size_t name_bound = strlen((const char *) name) + 1;
for (const xmlAttr *cur = node->properties; cur != NULL; cur = cur->next) {
if (lexbor_str_data_nlocmp_right(cur->name, name, name_bound)) {
if (lxb_selectors_str_cmp_loright((const char *) name, (const char *) cur->name)) {
attr = cur;
break;
}
@@ -154,18 +169,7 @@ static bool lxb_selectors_is_lowercased_html_attrib_name(const lxb_css_selector_
static void lxb_selectors_adapted_set_entry_id_ex(lxb_selectors_entry_t *entry, const lxb_css_selector_t *selector, const xmlNode *node)
{
entry->id.attr_case_insensitive = lxb_selectors_is_lowercased_html_attrib_name(selector);
if (node->doc != NULL && node->doc->dict != NULL) {
const xmlChar *interned = xmlDictExists(node->doc->dict, selector->name.data, selector->name.length);
if (interned != NULL) {
entry->id.name = interned;
entry->id.interned = true;
return;
}
}
entry->id.name = selector->name.data;
entry->id.interned = false;
}
static zend_always_inline void lxb_selectors_adapted_set_entry_id(lxb_selectors_entry_t *entry, const lxb_css_selector_t *selector, const xmlNode *node)
@@ -1686,8 +1690,8 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
case LXB_CSS_SELECTOR_PSEUDO_CLASS_ANY_LINK:
/* https://drafts.csswg.org/selectors/#the-any-link-pseudo */
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)
&& (lxb_selectors_adapted_cmp_local_name_literal(node, "a")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "area")))
&& (lxb_selectors_cmp_html_name_lit(node, "a")
|| lxb_selectors_cmp_html_name_lit(node, "area")))
{
return lxb_selectors_adapted_has_attr(node, "href");
}
@@ -1705,7 +1709,7 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
if (!php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)) {
return false;
}
if (lxb_selectors_adapted_cmp_local_name_literal(node, "input")) {
if (lxb_selectors_cmp_html_name_lit(node, "input")) {
const xmlAttr *dom_attr = lxb_selectors_adapted_attr(node, (const lxb_char_t *) "type");
if (dom_attr == NULL) {
return false;
@@ -1729,7 +1733,7 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
return res;
}
else if(lxb_selectors_adapted_cmp_local_name_literal(node, "option")) {
else if(lxb_selectors_cmp_html_name_lit(node, "option")) {
return lxb_selectors_adapted_has_attr(node, "selected");
}
@@ -1802,8 +1806,8 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
case LXB_CSS_SELECTOR_PSEUDO_CLASS_LINK:
/* https://html.spec.whatwg.org/multipage/semantics-other.html#selector-link */
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)
&& (lxb_selectors_adapted_cmp_local_name_literal(node, "a")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "area")))
&& (lxb_selectors_cmp_html_name_lit(node, "a")
|| lxb_selectors_cmp_html_name_lit(node, "area")))
{
return lxb_selectors_adapted_has_attr(node, "href");
}
@@ -1823,9 +1827,9 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
case LXB_CSS_SELECTOR_PSEUDO_CLASS_OPTIONAL:
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)
&& (lxb_selectors_adapted_cmp_local_name_literal(node, "input")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "select")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "textarea")))
&& (lxb_selectors_cmp_html_name_lit(node, "input")
|| lxb_selectors_cmp_html_name_lit(node, "select")
|| lxb_selectors_cmp_html_name_lit(node, "textarea")))
{
return !lxb_selectors_adapted_has_attr(node, "required");
}
@@ -1840,8 +1844,8 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
case LXB_CSS_SELECTOR_PSEUDO_CLASS_PLACEHOLDER_SHOWN:
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)
&& (lxb_selectors_adapted_cmp_local_name_literal(node, "input")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "textarea")))
&& (lxb_selectors_cmp_html_name_lit(node, "input")
|| lxb_selectors_cmp_html_name_lit(node, "textarea")))
{
return lxb_selectors_adapted_has_attr(node, "placeholder");
}
@@ -1856,9 +1860,9 @@ lxb_selectors_pseudo_class(const lxb_css_selector_t *selector,
case LXB_CSS_SELECTOR_PSEUDO_CLASS_REQUIRED:
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)
&& (lxb_selectors_adapted_cmp_local_name_literal(node, "input")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "select")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "textarea")))
&& (lxb_selectors_cmp_html_name_lit(node, "input")
|| lxb_selectors_cmp_html_name_lit(node, "select")
|| lxb_selectors_cmp_html_name_lit(node, "textarea")))
{
return lxb_selectors_adapted_has_attr(node, "required");
}
@@ -2104,24 +2108,24 @@ lxb_selectors_pseudo_class_disabled(const xmlNode *node)
}
if (lxb_selectors_adapted_has_attr(node, "disabled")
&& (lxb_selectors_adapted_cmp_local_name_literal(node, "button")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "input")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "select")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "textarea")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "optgroup")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "fieldset")))
&& (lxb_selectors_cmp_html_name_lit(node, "button")
|| lxb_selectors_cmp_html_name_lit(node, "input")
|| lxb_selectors_cmp_html_name_lit(node, "select")
|| lxb_selectors_cmp_html_name_lit(node, "textarea")
|| lxb_selectors_cmp_html_name_lit(node, "optgroup")
|| lxb_selectors_cmp_html_name_lit(node, "fieldset")))
{
return true;
}
if (lxb_selectors_adapted_cmp_local_name_literal(node, "fieldset")) {
if (lxb_selectors_cmp_html_name_lit(node, "fieldset")) {
const xmlNode *fieldset = node;
node = node->parent;
while (node != NULL && CMP_NODE_TYPE(node, XML_ELEMENT_NODE)) {
/* node is a disabled fieldset that is an ancestor of fieldset */
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)
&& lxb_selectors_adapted_cmp_local_name_literal(node, "fieldset")
&& lxb_selectors_cmp_html_name_lit(node, "fieldset")
&& lxb_selectors_adapted_has_attr(node, "disabled"))
{
/* Search first legend child and figure out if fieldset is a descendent from that. */
@@ -2129,7 +2133,7 @@ lxb_selectors_pseudo_class_disabled(const xmlNode *node)
do {
if (search_current->type == XML_ELEMENT_NODE
&& php_dom_ns_is_fast(search_current, php_dom_ns_is_html_magic_token)
&& lxb_selectors_adapted_cmp_local_name_literal(search_current, "legend")) {
&& lxb_selectors_cmp_html_name_lit(search_current, "legend")) {
/* search_current is a legend element. */
const xmlNode *inner_search_current = fieldset;
@@ -2235,8 +2239,8 @@ static bool
lxb_selectors_pseudo_class_read_write(const xmlNode *node)
{
if (php_dom_ns_is_fast(node, php_dom_ns_is_html_magic_token)) {
if (lxb_selectors_adapted_cmp_local_name_literal(node, "input")
|| lxb_selectors_adapted_cmp_local_name_literal(node, "textarea")) {
if (lxb_selectors_cmp_html_name_lit(node, "input")
|| lxb_selectors_cmp_html_name_lit(node, "textarea")) {
return !lxb_selectors_adapted_has_attr(node, "readonly") && !lxb_selectors_adapted_has_attr(node, "disabled");
} else {
const xmlAttr *attr = lxb_selectors_adapted_attr(node, (const lxb_char_t *) "contenteditable");

1
ext/dom/lexbor/selectors-adapted/selectors.h
View File

@@ -77,7 +77,6 @@ typedef lxb_selectors_entry_t *
typedef struct {
const xmlChar *name;
bool interned;
bool attr_case_insensitive;
} lxb_selectors_adapted_id;

33
ext/dom/tests/modern/css_selectors/gh20395.phpt Normal file
View File

@@ -0,0 +1,33 @@
--TEST--
GH-20395 (\Dom\ParentNode::querySelector and \Dom\ParentNode::querySelectorAll requires elements in $selectors to be lowercase)
--EXTENSIONS--
dom
--CREDITS--
DeveloperRob
--FILE--
<?php
$html = '<!doctype html><html><head></head><body></body></html>';
$dom = Dom\HtmlDocument::createFromString($html);
var_dump(is_null($dom->querySelector('html')));
var_dump(is_null($dom->querySelector('Html')));
var_dump(is_null($dom->querySelector('HTML')));
$dom->body->appendChild($dom->createElement('div'));
$dom->body->appendChild($dom->createElementNS('http://www.w3.org/1999/xhtml', 'Div'));
foreach ($dom->querySelectorAll('div') as $div) {
var_dump($div->localName);
}
foreach ($dom->querySelectorAll('Div') as $div) {
var_dump($div->localName);
}
?>
--EXPECT--
bool(false)
bool(false)
bool(false)
string(3) "div"
string(3) "div"

11
ext/dom/tests/modern/css_selectors/pseudo_classes_links.phpt
View File

@@ -11,6 +11,7 @@ $dom = DOM\XMLDocument::createFromString(<<<XML
<container>
<a href="http://example.com">Link</a>
<a xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Link</a>
<A xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Not actually a link</A>
<area xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Link</area>
</container>
XML);
@@ -18,6 +19,7 @@ XML);
test_helper($dom, ':any-link');
test_helper($dom, ':link');
test_helper($dom, 'a:not(:any-link)');
test_helper($dom, ':not(:any-link)');
?>
--EXPECT--
@@ -29,3 +31,12 @@ test_helper($dom, 'a:not(:any-link)');
<area xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Link</area>
--- Selector: a:not(:any-link) ---
<a href="http://example.com">Link</a>
--- Selector: :not(:any-link) ---
<container>
<a href="http://example.com">Link</a>
<a xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Link</a>
<A xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Not actually a link</A>
<area xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Link</area>
</container>
<a href="http://example.com">Link</a>
<A xmlns="http://www.w3.org/1999/xhtml" href="http://example.com">Not actually a link</A>