archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Access violation when ALLOC_FALLBACK fixed

Browse source 
Close GH-11312
This commit is contained in:
KoudelkaB 2023-05-24 17:23:27 +02:00 • committed by Ilija Tovilo
parent 6267601f84
commit 8946b7b141
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -4,6 +4,7 @@ PHP NEWS
- Opcache:
. Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
. Access violation on smm_shared_globals with ALLOC_FALLBACK. (KoudelkaB)
- Standard:
. Fix access on NULL pointer in array_merge_recursive(). (ilutov)

2
ext/opcache/zend_shared_alloc.c
View file

@ -191,6 +191,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
}
#if ENABLE_FILE_CACHE_FALLBACK
if (ALLOC_FALLBACK == res) {
smm_shared_globals = NULL;
return ALLOC_FALLBACK;
}
#endif
@ -216,6 +217,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
}
#if ENABLE_FILE_CACHE_FALLBACK
if (ALLOC_FALLBACK == res) {
smm_shared_globals = NULL;
return ALLOC_FALLBACK;
}
#endif