[php-src] master: Merge branch 'PHP-8.6'

From: Date: Wed, 11 Nov 2026 10:14:38 +0000
Subject: [php-src] master: Merge branch 'PHP-8.6'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-143576@lists.php.net to get a copy of this message
Author: ndossche (ndossche) Date: 2026-11-11T11:14:27+01:00 Commit: https://github.com/php/php-src/commit/cd89027b9aad1bb060d49df990298141aa9f02cf Raw diff: https://github.com/php/php-src/commit/cd89027b9aad1bb060d49df990298141aa9f02cf.diff Merge branch 'PHP-8.6' * PHP-8.6: Fix GH-25306: Assertion status == LXB_STATUS_OK in dom_parse_selector when lexbor allocation fails Changed paths: M ext/dom/parentnode/css_selectors.c Diff: 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 (#143576) next »