Merge branch 'PHP-8.4'

* PHP-8.4: Fix GH-15905: Assertion failure for TRACK_VARS_SERVER
php · Sep 26, 2024 · d7030c2 · d7030c2
2 parents aff26e4 + 05fce50
commit d7030c2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/main/php_variables.c b/main/php_variables.c
@@ -893,6 +893,7 @@ static bool php_auto_globals_create_server(zend_string *name)
 	} else {
 		zval_ptr_dtor_nogc(&PG(http_globals)[TRACK_VARS_SERVER]);
 		array_init(&PG(http_globals)[TRACK_VARS_SERVER]);
+		zend_hash_real_init_mixed(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));
 	}
 
 	check_http_proxy(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));

diff --git a/tests/basic/gh15905.phpt b/tests/basic/gh15905.phpt
@@ -0,0 +1,12 @@
+--TEST--
+GH-15905 (Assertion failure for TRACK_VARS_SERVER)
+--INI--
+variables_order=E
+auto_globals_jit=0
+register_argc_argv=1
+--FILE--
+<?php
+echo "okay\n";
+?>
+--EXPECT--
+okay