Merge branch 'PHP-8.1' into PHP-8.2

devnexen · devnexen · commit dbedb69f6a1a · 2022-10-23T00:46:46.000+01:00
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.2.0RC5
 
+- 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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,8 @@ void zend_exception_restore(void) /* {{{ */`
`161`	`161`
`162`	`162`	`static zend_always_inline bool is_handle_exception_set(void) {`
`163`	`163`	`zend_execute_data *execute_data = EG(current_execute_data);`
`164`		`- return !execute_data->func`
	`164`	`+ return !execute_data`
	`165`	`+ \|\| !execute_data->func`
`165`	`166`	`\|\| !ZEND_USER_CODE(execute_data->func->common.type)`
`166`	`167`	`\|\| execute_data->opline->opcode == ZEND_HANDLE_EXCEPTION;`
`167`	`168`	`}`