Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  Fix GH-22395: Avoid truncating base_convert() output at 64 characters (#22406)

Author: LamentXU123

NEWS

@@ -25,6 +25,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-22324 (Ignore leading namespace separator in
     ReflectionParameter::__construct()). (jorgsowa)
 
+- Standard:
+  . Fixed bug GH-22395 (base_convert() outputs at most 64 characters).
+    (Weilin Du)
+
 02 Jul 2026, PHP 8.5.8
 
 - Core:

ext/standard/math.c

@@ -24,6 +24,7 @@
 #include "zend_exceptions.h"
 #include "zend_multiply.h"
 #include "zend_portability.h"
+#include "zend_strtod.h"
 
 #include <float.h>
 #include <math.h>
@@ -949,7 +950,7 @@ PHPAPI zend_string * _php_math_zvaltobase(zval *arg, int base)
 	if (Z_TYPE_P(arg) == IS_DOUBLE) {
 		double fvalue = floor(Z_DVAL_P(arg)); /* floor it just in case */
 		char *ptr, *end;
-		char buf[(sizeof(double) << 3) + 1];
+		char buf[ZEND_DOUBLE_MAX_LENGTH];
 
 		/* Don't try to convert +/- infinity */
 		if (fvalue == ZEND_INFINITY || fvalue == -ZEND_INFINITY) {

ext/standard/tests/math/gh22395.phpt

@@ -0,0 +1,11 @@
+--TEST--
+GH-22395 (base_convert outputs at most 64 characters)
+--FILE--
+<?php
+$result = base_convert(str_repeat("1", 61), 36, 16);
+var_dump(strlen($result));
+var_dump(substr($result, 0, 13));
+?>
+--EXPECT--
+int(78)
+string(13) "4b61b5e0639ff"