Commit 3a1b95e43ae for php.net
commit 3a1b95e43ae6cf1b9c9ccb141e763d26a47762de
Merge: bbf8c393d74 f81f58c1719
Author: Weilin Du <weilindu@php.net>
Date: Sat Aug 8 16:52:21 2026 +0800
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
Fix GH-23116 and GH-23117: stack overflow when normalizing a deeply nested document (#23127)
diff --cc NEWS
index 01849a378ff,81f448cbd56..19cb73aba23
--- a/NEWS
+++ b/NEWS
@@@ -9,22 -6,25 +9,26 @@@ PH
. Fixed leak on double DatePeriod::__construct() call. (ilutov)
- DOM:
+ . Fixed bug GH-23116 (Stack overflow when normalizing a deeply nested
+ DOMDocument). (Lazizbek Ergashev)
+ . Fixed bug GH-23117 (Stack overflow when normalizing a deeply nested
+ Dom\XMLDocument). (Lazizbek Ergashev)
. Fixed bug GH-22825 (DOMElement::setAttribute() fails silently when the DTD
declares a default value for the attribute). (iliaal)
- . Fixed bug GH-22447 (UAF at dom_objects_free_storage when setting an
- attribute node that collides by local name with a namespaced
- attribute). (David Carlier)
-- MBString:
- . Fixed bug GH-22779 (mb_strrpos() returns the wrong position for a negative
- offset in a non-UTF-8 encoding). (Eyüp Can Akman)
- . Fixed bug GH-21036 (mb_ereg_search_getregs() crashes after mb_eregi()
- invalidates the regex cache). (Matthias Goergens)
+- Intl:
+ . Fixed IntlListFormatter::__construct() leaving stale global error state
+ after successful calls. (Weilin Du)
- Opcache:
- . Fixed bug GH-22857 (Function JIT emits wrong code for FETCH_OBJ_FUNC_ARG on a
- property hook getter, losing register-held variables). (Zhao Hao)
+ . Fixed GH-22693 (DT_TEXTREL in JIT-generated TLS access on x86_64).
+ (David Carlier)
+ . Fixed bug GH-22763 (JIT fails to clear ZREG_TYPE_ONLY after setting reg).
+ (Arnaud)
+ . Fixed bug GH-22857 (Function JIT emits wrong code for FETCH_OBJ_FUNC_ARG on
+ a property hook getter, losing register-held variables). (Zhao Hao)
+ . Fixed bug GH-22916 (Preserve parent regs in zend_jit_deoptimizer_start()).
+ (Arnaud)
- OpenSSL:
. Fix missing error check on invalid alpn protocols. (ndossche)