ext/opcache/zend_shared_alloc: add assertions on "locked" flag

MaxKellermann · Girgias · commit e1a25ff2ed16 · 2023-01-02T15:49:04.000Z
Let the PHP process crash if a bug causes incorrect locking calls.
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
@@ -453,6 +453,8 @@ void zend_shared_alloc_safe_unlock(void)
 
 void zend_shared_alloc_lock(void)
 {
+	ZEND_ASSERT(!ZCG(locked));
+
 #ifndef ZEND_WIN32
 	struct flock mem_write_lock;
 
@@ -490,6 +492,8 @@ void zend_shared_alloc_lock(void)
 
 void zend_shared_alloc_unlock(void)
 {
+	ZEND_ASSERT(ZCG(locked));
+
 #ifndef ZEND_WIN32
 	struct flock mem_write_unlock;
 

Original file line number	Diff line number	Diff line change
`@@ -453,6 +453,8 @@ void zend_shared_alloc_safe_unlock(void)`
`453`	`453`
`454`	`454`	`void zend_shared_alloc_lock(void)`
`455`	`455`	`{`
	`456`	`+ ZEND_ASSERT(!ZCG(locked));`
	`457`	`+`
`456`	`458`	`#ifndef ZEND_WIN32`
`457`	`459`	`struct flock mem_write_lock;`
`458`	`460`
`@@ -490,6 +492,8 @@ void zend_shared_alloc_lock(void)`
`490`	`492`
`491`	`493`	`void zend_shared_alloc_unlock(void)`
`492`	`494`	`{`
	`495`	`+ ZEND_ASSERT(ZCG(locked));`
	`496`	`+`
`493`	`497`	`#ifndef ZEND_WIN32`
`494`	`498`	`struct flock mem_write_unlock;`
`495`	`499`