php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2' into PHP-8.3

Browse Source 
* PHP-8.2:
  Fix GH-15905: Assertion failure for TRACK_VARS_SERVER
This commit is contained in:
Christoph M. Becker
2024-09-26 15:34:22 +02:00
parent 91c06790de 87d59d7fdd
commit bf8c01db7f
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -5,6 +5,7 @@ PHP NEWS
- Core: - Core:
. Fixed bug GH-16054 (Segmentation fault when resizing hash table iterator . Fixed bug GH-16054 (Segmentation fault when resizing hash table iterator
list while adding). (nielsdos) list while adding). (nielsdos)
. Fixed bug GH-15905 (Assertion failure for TRACK_VARS_SERVER). (cmb)
- DOM: - DOM:
. Fixed bug GH-16039 (Segmentation fault (access null pointer) in . Fixed bug GH-16039 (Segmentation fault (access null pointer) in

1
main/php_variables.c
View File

@@ -897,6 +897,7 @@ static bool php_auto_globals_create_server(zend_string *name)
} else { } else {
zval_ptr_dtor_nogc(&PG(http_globals)[TRACK_VARS_SERVER]); zval_ptr_dtor_nogc(&PG(http_globals)[TRACK_VARS_SERVER]);
array_init(&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])); check_http_proxy(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));

12
tests/basic/gh15905.phpt Normal file
View File

@@ -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