[php-src] master: Merge branch 'PHP-8.4' into PHP-8.5
| From: | ndossche | Date: | Wed, 11 Nov 2026 10:14:35 +0000 |
| Subject: | [php-src] master: Merge branch 'PHP-8.4' into PHP-8.5 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-143575@lists.php.net to get a copy of this message | ||
Author: ndossche (ndossche)
Date: 2026-11-11T11:14:01+01:00
Commit: https://github.com/php/php-src/commit/20520eb9dd36af552a2222a118fdeca3e22dbe2f
Raw diff: https://github.com/php/php-src/commit/20520eb9dd36af552a2222a118fdeca3e22dbe2f.diff
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-25306: Assertion status == LXB_STATUS_OK in dom_parse_selector when lexbor allocation fails
Changed paths:
M NEWS
M ext/dom/parentnode/css_selectors.c
Diff:
diff --git a/NEWS b/NEWS
index 03ab890b03c6..3bbeff923e19 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,10 @@ PHP NEWS
. Fixed dba_close() not closing a database opened with dba_popen().
(Ilia Alshanetsky)
+- DOM:
+ . Fixed bug GH-25306 (Assertion status == LXB_STATUS_OK in dom_parse_selector
+ when lexbor allocation fails). (ndossche)
+
- MBString:
. Fixed stack overflow in mb_check_encoding() and mb_convert_encoding() with
deeply nested arrays. (Eyüp Can Akman)
diff --git a/ext/dom/parentnode/css_selectors.c b/ext/dom/parentnode/css_selectors.c
index d454bcae1707..2ab2674ee22a 100644
--- a/ext/dom/parentnode/css_selectors.c
+++ b/ext/dom/parentnode/css_selectors.c
@@ -84,11 +84,15 @@ static lxb_css_selector_list_t *dom_parse_selector(
memset(parser, 0, sizeof(lxb_css_parser_t));
status = lxb_css_parser_init(parser, NULL);
- ZEND_ASSERT(status == LXB_STATUS_OK);
+ if (UNEXPECTED(status != LXB_STATUS_OK)) {
+ return NULL;
+ }
memset(selectors, 0, sizeof(lxb_selectors_t));
status = lxb_selectors_init(selectors);
- ZEND_ASSERT(status == LXB_STATUS_OK);
+ if (UNEXPECTED(status != LXB_STATUS_OK)) {
+ return NULL;
+ }
lxb_selectors_opt_set(selectors, dom_quirks_opt(options, intern));
lxb_css_selector_list_t *list = lxb_css_selectors_parse(parser, (const lxb_char_t *)
ZSTR_VAL(selectors_str), ZSTR_LEN(selectors_str));