Commit a8a3635199e for php
commit a8a3635199e2043a394ecd0e70782812d6f3da65
Merge: e5e5a8a9d20 b7b9c8be263
Author: Arnaud Le Blanc <arnaud.lb@gmail.com>
Date: Thu Oct 29 10:30:09 2026 +0100
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix json_encode() reporting false "Recursion detected" after OOM for hooked-property objects (#24992)
diff --cc NEWS
index 6899e0b14e8,1479850128a..f26b0f190e0
--- a/NEWS
+++ b/NEWS
@@@ -51,6 -84,20 +51,11 @@@ PH
. Fixed IntlDateFormatter parse functions truncating an $offset below
INT_MIN. (Marc Bennewitz)
+ - JSON:
+ . Fixed json_encode() leaving the recursion guard set on objects with hooked
+ properties after running out of memory while escaping a property name.
+ (adapik)
+
-- MBString:
- . Fixed bug GH-23958 (truncated encoding names resolving to full names). (Kamil Tekiela)
- . Fixed out-of-bounds read in php_mb_rfc1867_getword() on a multibyte lead
- byte at the end of a multipart field name. (Jorg Sowa)
-
-- MySQLnd:
- . Fixed bug GH-24293 (Segfault on connect with an empty password to a
- MariaDB PAM account). (lazerg)
-
- Opcache:
. Fixed tracing JIT returning a wrapped integer instead of a float on
integer overflow after an integer was compared with a float or