Merge branch 'PHP-8.2' into PHP-8.3

cmb69 · cmb69 · commit bf8c01db7f89 · 2024-09-26T15:34:34.000+02:00
* PHP-8.2: Fix phpGH-15905: Assertion failure for TRACK_VARS_SERVER
diff --git a/NEWS b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
 - Core:
   . 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
@@ -897,6 +897,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

Original file line number	Diff line number	Diff line change
`@@ -897,6 +897,7 @@ static bool php_auto_globals_create_server(zend_string *name)`
`897`	`897`	`} else {`
`898`	`898`	`zval_ptr_dtor_nogc(&PG(http_globals)[TRACK_VARS_SERVER]);`
`899`	`899`	`array_init(&PG(http_globals)[TRACK_VARS_SERVER]);`
	`900`	`+ zend_hash_real_init_mixed(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));`
`900`	`901`	`}`
`901`	`902`
`902`	`903`	`check_http_proxy(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));`