Pass NULL to end handler on uncaught exception

SammyK · SammyK · commit 95f943a0d549 · 2020-11-16T10:30:15.000-08:00
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -7720,7 +7720,7 @@ ZEND_VM_HELPER(zend_dispatch_try_catch_finally_helper, ANY, ANY, uint32_t try_ca
 
 	/* Uncaught exception */
 	if (zend_observer_fcall_op_array_extension != -1) {
-		zend_observer_fcall_end(execute_data, EX(return_value));
+		zend_observer_fcall_end(execute_data, NULL);
 	}
 	cleanup_live_vars(execute_data, op_num, 0);
 	if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -2905,7 +2905,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try
 
 	/* Uncaught exception */
 	if (zend_observer_fcall_op_array_extension != -1) {
-		zend_observer_fcall_end(execute_data, EX(return_value));
+		zend_observer_fcall_end(execute_data, NULL);
 	}
 	cleanup_live_vars(execute_data, op_num, 0);
 	if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {

Original file line number	Diff line number	Diff line change
`@@ -7720,7 +7720,7 @@ ZEND_VM_HELPER(zend_dispatch_try_catch_finally_helper, ANY, ANY, uint32_t try_ca`
`7720`	`7720`
`7721`	`7721`	`/* Uncaught exception */`
`7722`	`7722`	`if (zend_observer_fcall_op_array_extension != -1) {`
`7723`		`- zend_observer_fcall_end(execute_data, EX(return_value));`
	`7723`	`+ zend_observer_fcall_end(execute_data, NULL);`
`7724`	`7724`	`}`
`7725`	`7725`	`cleanup_live_vars(execute_data, op_num, 0);`
`7726`	`7726`	`if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {`
Original file line number	Diff line number	Diff line change
`@@ -2905,7 +2905,7 @@ static zend_never_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_dispatch_try`
`2905`	`2905`
`2906`	`2906`	`/* Uncaught exception */`
`2907`	`2907`	`if (zend_observer_fcall_op_array_extension != -1) {`
`2908`		`- zend_observer_fcall_end(execute_data, EX(return_value));`
	`2908`	`+ zend_observer_fcall_end(execute_data, NULL);`
`2909`	`2909`	`}`
`2910`	`2910`	`cleanup_live_vars(execute_data, op_num, 0);`
`2911`	`2911`	`if (UNEXPECTED((EX_CALL_INFO() & ZEND_CALL_GENERATOR) != 0)) {`