Commit 171b52c98f9 for php.net

commit 171b52c98f9c847bf9d2752d1c73c8dd365e2ed0
Merge: 9b089edcbdd 03113b09ce5
Author: Niels Dossche <7771979+ndossche@users.noreply.github.com>
Date:   Mon Jan 5 20:01:54 2026 +0100

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Fix GH-20833: mb_str_pad() divide by zero if padding string is invalid in the encoding

diff --cc NEWS
index 97224d6a187,fc4f5d3d297..5a03492c242
--- a/NEWS
+++ b/NEWS
@@@ -1,13 -1,11 +1,17 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 8.4.18
 +?? ??? ????, PHP 8.5.3
 +
 +- Core:
 +  . Fixed bug GH-20806 (preserve_none feature compatiblity with LTO).
 +    (henderkes)
 +  . Fixed bug GH-20767 (build failure with musttail/preserve_none feature
 +    on macOs). (David Carlier)

+ - MbString:
+   . Fixed bug GH-20833 (mb_str_pad() divide by zero if padding string is
+     invalid in the encoding). (ndossche)
+
  - Readline:
    . Fixed bug GH-18139 (Memory leak when overriding some settings
      via readline_info()). (ndossche)