Skip to content

Commit 0268cb0

Browse files
committed
Merge branch 'PHP-8.3'
* PHP-8.3: Restore error message incorrectly removed by commit 10d43c4 (related to GH-15497)
2 parents 45dac39 + c15bb9a commit 0268cb0

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

ext/opcache/zend_shared_alloc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,11 @@ void *zend_shared_alloc(size_t size)
371371
int i;
372372
size_t block_size = ZEND_ALIGNED_SIZE(size);
373373

374+
#if 1
375+
if (!ZCG(locked)) {
376+
zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Shared memory lock not obtained");
377+
}
378+
#endif
374379
if (block_size > ZSMMG(shared_free)) { /* No hope to find a big-enough block */
375380
SHARED_ALLOC_FAILED();
376381
return NULL;

0 commit comments

Comments
 (0)