Fix GH-9709: Guard against current_execute_data==NULL in is_handle_ex…

…ception_set
php · Oct 22, 2022 · 265f399 · 265f399
1 parent 59f8f2d
commit 265f399
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -161,7 +161,8 @@ void zend_exception_restore(void) /* {{{ */
 
 static zend_always_inline bool is_handle_exception_set(void) {
 	zend_execute_data *execute_data = EG(current_execute_data);
-	return !execute_data->func
+	return !execute_data
+		|| !execute_data->func
 		|| !ZEND_USER_CODE(execute_data->func->common.type)
 		|| execute_data->opline->opcode == ZEND_HANDLE_EXCEPTION;
 }