Commit e9ac0d54b4a for php
commit e9ac0d54b4a0f43a40ff4aa08d27f7729509da1f
Merge: 48c6b63c23e 79a4c602113
Author: Weilin Du <weilindu@php.net>
Date: Tue Nov 17 01:21:50 2026 +0800
Merge branch 'PHP-8.5' into PHP-8.6
* PHP-8.5:
Fix json_decode() and json_validate() depth upper bound messages (#25468)
diff --cc NEWS
index cca27c2d71c,b138439b8f3..2c19cee1f86
--- a/NEWS
+++ b/NEWS
@@@ -60,11 -42,13 +60,14 @@@ PH
. Fixed stack overflow in filter_var() and filter_var_array() with deeply
nested arrays. (Eyüp Can Akman)
-- GD:
- . Fixed imagecreatefromstring() continuing to decode after throwing for a
- string longer than INT_MAX. (lacatoire)
+- Intl:
+ . Fixed NumberFormatter::getSymbol(), setSymbol(), getAttribute() and
+ setAttribute() accepting out-of-range values that truncate to a valid one.
+ (Jorg Sowa)
+ - JSON:
+ . Fixed json_decode() and json_validate() error messages. (lacatoire)
+
- MBString:
. Fixed stack overflow in mb_check_encoding() and mb_convert_encoding() with
deeply nested arrays. (Eyüp Can Akman)
diff --cc ext/json/tests/bug72787.phpt
index 637c22014f4,4c2f8d62c5d..f2541b3225c
--- a/ext/json/tests/bug72787.phpt
+++ b/ext/json/tests/bug72787.phpt
@@@ -13,4 -13,4 +13,4 @@@ try
?>
--EXPECTF--
- ValueError: json_decode(): Argument #3 ($depth) must be less than %d
-json_decode(): Argument #3 ($depth) must be less than or equal to %d
++ValueError: json_decode(): Argument #3 ($depth) must be less than or equal to %d
diff --cc ext/json/tests/json_validate_003.phpt
index e538ed72ee6,faad350b4e9..c3797c756fb
--- a/ext/json/tests/json_validate_003.phpt
+++ b/ext/json/tests/json_validate_003.phpt
@@@ -14,6 -14,6 +14,6 @@@ try
?>
--EXPECTF--
- ValueError: json_validate(): Argument #2 ($depth) must be less than %d
-json_validate(): Argument #2 ($depth) must be less than or equal to %d
++ValueError: json_validate(): Argument #2 ($depth) must be less than or equal to %d
int(0)
string(8) "No error"