diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-05-23 11:20:46 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-05-23 11:20:46 +0300 |
| commit | fdb7fc6153cfa8788d11e3dc74bc4f899bcdd42a (patch) | |
| tree | 92db675b8cb6a9f05aad74af4b0107fe360092d6 | |
| parent | dcccdc471d7c6794ff9b13d3dc9c248bf7c16da9 (diff) | |
| download | php-git-fdb7fc6153cfa8788d11e3dc74bc4f899bcdd42a.tar.gz | |
Fixed double mutex unlock
| -rw-r--r-- | ext/opcache/ZendAccelerator.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 2162718bed..6fd341eb06 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -4255,9 +4255,10 @@ static int accel_finish_startup(void) orig_report_memleaks = PG(report_memleaks); PG(report_memleaks) = 0; - php_request_shutdown(NULL); + php_request_shutdown(NULL); /* calls zend_shared_alloc_unlock(); */ PG(report_memleaks) = orig_report_memleaks; } else { + zend_shared_alloc_unlock(); ret = FAILURE; } #ifdef ZEND_SIGNALS @@ -4274,8 +4275,6 @@ static int accel_finish_startup(void) sapi_module.ub_write = orig_ub_write; sapi_module.flush = orig_flush; - zend_shared_alloc_unlock(); - sapi_activate(); return ret; |