Fix exception promition for undef var in frameless calls

Author: iluuu1994

Zend/tests/frameless_undefined_var.phpt

@@ -0,0 +1,18 @@
+--TEST--
+Undefined var in frameless call
+--FILE--
+<?php
+set_error_handler(function ($errno, $errstr) {
+    throw new Exception($errstr);
+});
+function test() {
+    strpos($foo, 'o');
+}
+try {
+    test();
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Undefined variable $foo

Zend/zend_vm_def.h

@@ -9562,7 +9562,12 @@ ZEND_VM_HANDLER(205, ZEND_FRAMELESS_ICALL_1, CONST|TMP|VAR|CV, UNUSED)
 	USE_OPLINE
 	SAVE_OPLINE();
 	zend_frameless_function_1 function = (zend_frameless_function_1)zend_flf_handlers[opline->extended_value];
-	function(EX_VAR(opline->result.var), GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R));
+	zval *arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
+	if (EG(exception)) {
+		ZVAL_NULL(EX_VAR(opline->result.var));
+		HANDLE_EXCEPTION();
+	}
+	function(EX_VAR(opline->result.var), arg1);
 	FREE_OP1();
 	if (EG(exception)) {
 		ZVAL_NULL(EX_VAR(opline->result.var));
@@ -9576,10 +9581,13 @@ ZEND_VM_HANDLER(206, ZEND_FRAMELESS_ICALL_2, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
 	USE_OPLINE
 	SAVE_OPLINE();
 	zend_frameless_function_2 function = (zend_frameless_function_2)zend_flf_handlers[opline->extended_value];
-	function(
-		EX_VAR(opline->result.var),
-		GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
-		GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R));
+	zval *arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
+	zval *arg2 = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R);
+	if (EG(exception)) {
+		ZVAL_NULL(EX_VAR(opline->result.var));
+		HANDLE_EXCEPTION();
+	}
+	function(EX_VAR(opline->result.var), arg1, arg2);
 	FREE_OP1();
 	FREE_OP2();
 	if (EG(exception)) {
@@ -9594,11 +9602,14 @@ ZEND_VM_HANDLER(207, ZEND_FRAMELESS_ICALL_3, ANY, ANY)
 	USE_OPLINE
 	SAVE_OPLINE();
 	zend_frameless_function_3 function = (zend_frameless_function_3)zend_flf_handlers[opline->extended_value];
-	function(
-		EX_VAR(opline->result.var),
-		GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
-		GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R),
-		GET_OP_DATA_ZVAL_PTR_DEREF(BP_VAR_R));
+	zval *arg1 = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
+	zval *arg2 = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R);
+	zval *arg3 = GET_OP_DATA_ZVAL_PTR_DEREF(BP_VAR_R);
+	if (EG(exception)) {
+		ZVAL_NULL(EX_VAR(opline->result.var));
+		HANDLE_EXCEPTION();
+	}
+	function(EX_VAR(opline->result.var), arg1, arg2, arg3);
 	FREE_OP1();
 	FREE_OP2();
 	FREE_OP_DATA();