Merge branch 'PHP-7.2' into PHP-7.3

dstogov · dstogov · commit 354a76bb800b · 2019-05-21T00:08:03.000+03:00
* PHP-7.2:
  Prevent race condition in opcache_reset()
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -766,7 +766,10 @@ static ZEND_FUNCTION(opcache_reset)
 		RETURN_FALSE;
 	}
 
+	/* exclusive lock */
+	zend_shared_alloc_lock();
 	zend_accel_schedule_restart(ACCEL_RESTART_USER);
+	zend_shared_alloc_unlock();
 	RETURN_TRUE;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -766,7 +766,10 @@ static ZEND_FUNCTION(opcache_reset)`
`766`	`766`	`RETURN_FALSE;`
`767`	`767`	`}`
`768`	`768`
	`769`	`+ /* exclusive lock */`
	`770`	`+ zend_shared_alloc_lock();`
`769`	`771`	`zend_accel_schedule_restart(ACCEL_RESTART_USER);`
	`772`	`+ zend_shared_alloc_unlock();`
`770`	`773`	`RETURN_TRUE;`
`771`	`774`	`}`
`772`	`775`