Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix phpGH-15905: Assertion failure for TRACK_VARS_SERVER
dstogov · Sep 26, 2024 · 05fce50 · 05fce50
2 parents 6f7ec6a + bf8c01d
commit 05fce50
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,7 @@ PHP                                                                        NEWS
   . Fixed bug GH-16040 (Use-after-free of object released in hook). (ilutov)
   . Fixed bug GH-16054 (Segmentation fault when resizing hash table iterator
     list while adding). (nielsdos)
+  . Fixed bug GH-15905 (Assertion failure for TRACK_VARS_SERVER). (cmb)
 
 - DOM:
   . Fixed bug GH-16039 (Segmentation fault (access null pointer) in

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