Merge branch 'PHP-8.2'

* PHP-8.2:
  Access violation when ALLOC_FALLBACK fixed
This commit is contained in:
Ilija Tovilo 2023-05-25 11:02:09 +02:00
commit adb3d5240b
No known key found for this signature in database
GPG key ID: A4F5D403F118200A

View file

@ -211,6 +211,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
@ -236,6 +237,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