Merge branch 'PHP-7.4'

dstogov · dstogov · commit 83b12d5b5781 · 2019-05-21T00:08:22.000+03:00
* PHP-7.4:
  Prevent race condition in opcache_reset()
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -813,7 +813,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
`@@ -813,7 +813,10 @@ static ZEND_FUNCTION(opcache_reset)`
`813`	`813`	`RETURN_FALSE;`
`814`	`814`	`}`
`815`	`815`
	`816`	`+ /* exclusive lock */`
	`817`	`+ zend_shared_alloc_lock();`
`816`	`818`	`zend_accel_schedule_restart(ACCEL_RESTART_USER);`
	`819`	`+ zend_shared_alloc_unlock();`
`817`	`820`	`RETURN_TRUE;`
`818`	`821`	`}`
`819`	`822`