From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 23 May 2019 08:20:46 +0000 (+0300)
Subject: Fixed double mutex unlock
X-Git-Tag: php-7.4.0alpha1~209
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdb7fc6153cfa8788d11e3dc74bc4f899bcdd42a;p=php

Fixed double mutex unlock
---

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;