File tree Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Expand file tree Collapse file tree 2 files changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -52,6 +52,8 @@ PHP NEWS
52
52
- Opcache:
53
53
. Fixed bug GH-10914 (OPCache with Enum and Callback functions results in
54
54
segmentation fault). (nielsdos)
55
+ . Prevent potential deadlock if accelerated globals cannot be allocated.
56
+ (nielsdos)
55
57
56
58
- PCNTL:
57
59
. Fixed bug GH-11498 (SIGCHLD is not always returned from proc_open).
Original file line number Diff line number Diff line change @@ -2867,10 +2867,10 @@ static int zend_accel_init_shm(void)
2867
2867
2868
2868
accel_shared_globals = zend_shared_alloc (accel_shared_globals_size );
2869
2869
if (!accel_shared_globals ) {
2870
+ zend_shared_alloc_unlock ();
2870
2871
zend_accel_error_noreturn (ACCEL_LOG_FATAL ,
2871
2872
"Insufficient shared memory for interned strings buffer! (tried to allocate %zu bytes)" ,
2872
2873
accel_shared_globals_size );
2873
- zend_shared_alloc_unlock ();
2874
2874
return FAILURE ;
2875
2875
}
2876
2876
memset (accel_shared_globals , 0 , sizeof (zend_accel_shared_globals ));
You can’t perform that action at this time.
0 commit comments