[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6

From: Date: Wed, 11 Nov 2026 10:14:35 +0000
Subject: [php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-143574@lists.php.net to get a copy of this message
Author: ndossche (ndossche) Date: 2026-11-11T11:14:22+01:00 Commit: https://github.com/php/php-src/commit/9e1746ac7006b1730f02e738541ca36a3ac5df40 Raw diff: https://github.com/php/php-src/commit/9e1746ac7006b1730f02e738541ca36a3ac5df40.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: 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 4fa6391d55e5..101e48c11fa7 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,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) + - Fileinfo: . Fixed bug GH-25051 (TrueType fonts detected as application/octet-stream since libmagic 5.48). (Weilin Du) diff --git a/ext/dom/parentnode/css_selectors.c b/ext/dom/parentnode/css_selectors.c index 6b2c374dcec4..6f23fb027cdd 100644 --- a/ext/dom/parentnode/css_selectors.c +++ b/ext/dom/parentnode/css_selectors.c @@ -82,11 +82,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));

« previous php.cvs (#143574) next »