Skip to content

Commit 5b8e941

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Access violation when ALLOC_FALLBACK fixed
2 parents 150825d + 8946b7b commit 5b8e941

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PHP NEWS
44

55
- Opcache:
66
. Fix allocation loop in zend_shared_alloc_startup(). (nielsdos)
7+
. Access violation on smm_shared_globals with ALLOC_FALLBACK. (KoudelkaB)
78

89
- PCRE:
910
. Fix preg_replace_callback_array() pattern validation. (ilutov)

ext/opcache/zend_shared_alloc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
192192
}
193193
#if ENABLE_FILE_CACHE_FALLBACK
194194
if (ALLOC_FALLBACK == res) {
195+
smm_shared_globals = NULL;
195196
return ALLOC_FALLBACK;
196197
}
197198
#endif
@@ -217,6 +218,7 @@ int zend_shared_alloc_startup(size_t requested_size, size_t reserved_size)
217218
}
218219
#if ENABLE_FILE_CACHE_FALLBACK
219220
if (ALLOC_FALLBACK == res) {
221+
smm_shared_globals = NULL;
220222
return ALLOC_FALLBACK;
221223
}
222224
#endif

0 commit comments

Comments
 (0)