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

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

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