1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.2'

* PHP-8.2:
  Check if restart is pending before trying to lock SHM
This commit is contained in:
Ilija Tovilo
2023-07-31 20:01:23 +02:00
2 changed files with 5 additions and 0 deletions

4
NEWS
View File

@@ -18,6 +18,10 @@ PHP NEWS
- MBString:
. Fix use-after-free of mb_list_encodings() return value. (ilutov)
- Opcache:
. Avoid adding an unnecessary read-lock when loading script from shm if
restart is in progress. (mikhainin)
- Streams:
. Fixed bug GH-11735 (Use-after-free when unregistering user stream wrapper
from itself). (ilutov)

View File

@@ -1868,6 +1868,7 @@ zend_persistent_script *zend_file_cache_script_load(zend_file_handle *file_handl
if (!file_cache_only &&
!ZCSG(restart_in_progress) &&
!ZCSG(restart_pending) &&
!ZSMMG(memory_exhausted) &&
accelerator_shm_read_lock() == SUCCESS) {
/* exclusive lock */