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

MaxKellermann · MaxKellermann · commit 1e148b6e9465 · 2023-01-09T12:50:18.000+01:00
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
@@ -468,6 +468,8 @@ void zend_shared_alloc_safe_unlock(void)
 
 void zend_shared_alloc_lock(void)
 {
+	ZEND_ASSERT(!ZCG(locked));
+
 #ifdef USE_PTHREAD_MUTEX
 
 #ifdef ZTS
@@ -512,6 +514,8 @@ void zend_shared_alloc_lock(void)
 
 void zend_shared_alloc_unlock(void)
 {
+	ZEND_ASSERT(ZCG(locked));
+
 #if !defined(ZEND_WIN32) && !defined(USE_PTHREAD_MUTEX)
 	struct flock mem_write_unlock;
 

Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,8 @@ void zend_shared_alloc_safe_unlock(void)`
`468`	`468`
`469`	`469`	`void zend_shared_alloc_lock(void)`
`470`	`470`	`{`
	`471`	`+ ZEND_ASSERT(!ZCG(locked));`
	`472`	`+`
`471`	`473`	`#ifdef USE_PTHREAD_MUTEX`
`472`	`474`
`473`	`475`	`#ifdef ZTS`
`@@ -512,6 +514,8 @@ void zend_shared_alloc_lock(void)`
`512`	`514`
`513`	`515`	`void zend_shared_alloc_unlock(void)`
`514`	`516`	`{`
	`517`	`+ ZEND_ASSERT(ZCG(locked));`
	`518`	`+`
`515`	`519`	`#if !defined(ZEND_WIN32) && !defined(USE_PTHREAD_MUTEX)`
`516`	`520`	`struct flock mem_write_unlock;`
`517`	`521`