Merge branch 'PHP-8.0' into PHP-8.1

Author: devnexen

NEWS

@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.1.13
 
+- 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)

Zend/zend_exceptions.c

@@ -156,7 +156,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;
 }