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.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix GH-18112: NULL access with preloading and INI option
This commit is contained in:
Niels Dossche
2025-03-20 19:12:47 +01:00
parent 9488684703 e9c0296240
commit 66498152f1
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -63,6 +63,7 @@ PHP NEWS
. Fixed bug GH-18050 (IN_ARRAY optimization in DFA pass is broken). (ilutov)
. Fixed bug GH-18113 (stack-buffer-overflow ext/opcache/jit/ir/ir_sccp.c).
(nielsdos)
. Fixed bug GH-18112 (NULL access with preloading and INI option). (nielsdos)
- Standard:
. Fix memory leaks in array_any() / array_all(). (nielsdos)

5
ext/opcache/ZendAccelerator.c
View File

@@ -4733,6 +4733,11 @@ static zend_result accel_finish_startup_preload(bool in_child)
EG(class_table) = NULL;
EG(function_table) = NULL;
PG(report_memleaks) = orig_report_memleaks;
#ifdef ZTS
/* Reset the virtual CWD state back to the original state created by virtual_cwd_startup().
* This is necessary because the normal startup code assumes the CWD state is active. */
virtual_cwd_activate();
#endif
} else {
zend_shared_alloc_unlock();
ret = FAILURE;