Merge branch 'PHP-7.3' into PHP-7.4

dstogov · dstogov · commit e2f8d906cfd1 · 2019-05-21T00:08:12.000+03:00
* PHP-7.3:
  Prevent race condition in opcache_reset()
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -792,7 +792,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
`@@ -792,7 +792,10 @@ static ZEND_FUNCTION(opcache_reset)`
`792`	`792`	`RETURN_FALSE;`
`793`	`793`	`}`
`794`	`794`
	`795`	`+ /* exclusive lock */`
	`796`	`+ zend_shared_alloc_lock();`
`795`	`797`	`zend_accel_schedule_restart(ACCEL_RESTART_USER);`
	`798`	`+ zend_shared_alloc_unlock();`
`796`	`799`	`RETURN_TRUE;`
`797`	`800`	`}`
`798`	`801`