Fix GH-9709: Guard against current_execute_data==NULL in is_handle_exception_set

adsr · devnexen · commit 45e224cf5183 · 2022-10-23T00:46:05.000+01:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2022, PHP 8.0.26
 
+- CLI:
+  . Fixed bug GH-9709 (Null pointer dereference with -w/-s options). (Adam Saponara)
+
 - Core:
   . Fixed bug GH-9752 (Generator crashes when interrupted during argument
     evaluation with extra named params). (Arnaud)
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
@@ -146,7 +146,8 @@ void zend_exception_restore(void) /* {{{ */
 
 static zend_always_inline zend_bool is_handle_exception_set() {
 	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;
 }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,8 @@ void zend_exception_restore(void) /* {{{ */`
`146`	`146`
`147`	`147`	`static zend_always_inline zend_bool is_handle_exception_set() {`
`148`	`148`	`zend_execute_data *execute_data = EG(current_execute_data);`
`149`		`- return !execute_data->func`
	`149`	`+ return !execute_data`
	`150`	`+ \|\| !execute_data->func`
`150`	`151`	`\|\| !ZEND_USER_CODE(execute_data->func->common.type)`
`151`	`152`	`\|\| execute_data->opline->opcode == ZEND_HANDLE_EXCEPTION;`
`152`	`153`	`}`