Commit d9a818d6c99 for php.net
commit d9a818d6c9936a115d5807037997878987717682
Merge: fa825cb8a05 d9c36391602
Author: Alexandre Daubois <alex.daubois@gmail.com>
Date: Mon Sep 14 13:54:34 2026 +0200
Merge branch 'PHP-8.4' into PHP-8.5
* PHP-8.4:
[skip ci] lexbor: Reference upstream commits as lexbor/lexbor@<sha> in NEWS
diff --cc NEWS
index 387caeeca43,4bdca4fd447..811893eff58
--- a/NEWS
+++ b/NEWS
@@@ -17,13 -15,11 +17,13 @@@ PH
. Fixed cloning IntlDateFormatter and MessageFormatter losing PHP-side state
such as dateType, timeType, calendar and the message pattern.
(Ilia Alshanetsky)
+ . Fixed a crash when converting with a cloned UConverter that uses
+ toUCallback/fromUCallback. (Ilia Alshanetsky)
- Lexbor:
- . Merge patches 8a14bc0 and f67ce4b, fixing a heap buffer overflow in
- :lexbor-contains() parsing and buffer overflows in malformed decode
- replay. (alexandre-daubois)
+ . Merge patches lexbor/lexbor@8a14bc0 and lexbor/lexbor@f67ce4b, fixing a
+ heap buffer overflow in :lexbor-contains() parsing and buffer overflows
+ in malformed decode replay. (alexandre-daubois)
- MBString:
. Fixed bug GH-23106 (mb_strpos() reads past the end of a haystack ending in