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

Merge branch 'PHP-8.3'

* PHP-8.3:
  Restore error message incorrectly removed by commit 10d43c4 (related to GH-15497)
This commit is contained in:
Dmitry Stogov
2024-08-29 17:00:43 +03:00

View File

@@ -371,6 +371,11 @@ void *zend_shared_alloc(size_t size)
int i;
size_t block_size = ZEND_ALIGNED_SIZE(size);
#if 1
if (!ZCG(locked)) {
zend_accel_error_noreturn(ACCEL_LOG_ERROR, "Shared memory lock not obtained");
}
#endif
if (block_size > ZSMMG(shared_free)) { /* No hope to find a big-enough block */
SHARED_ALLOC_FAILED();
return NULL;