Fix memory leak on unknown named param

diff --git a/Zend/tests/named_params/unknown_named_param.phpt b/Zend/tests/named_params/unknown_named_param.phpt
index 9e299dc953b915bda32ae1dd2a1d7009c3df05ea..79ca89169d0fd4ae0dc97ad3728da0716cd51f72 100644 (file)
--- a/Zend/tests/named_params/unknown_named_param.phpt
+++ b/Zend/tests/named_params/unknown_named_param.phpt
@@ -15,6 +15,12 @@ try {
     echo $e->getMessage(), "\n";
 }
 
+try {
+    test(b: new stdClass);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
 try {
     test(b: 2, a: 1);
 } catch (Error $e) {
@@ -31,3 +37,4 @@ try {
 --EXPECT--
 Unknown named parameter $b
 Unknown named parameter $b
+Unknown named parameter $b

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 1780f6bbe67ef42bb3c2b165d91069a786910697..561c23af8c2886b70b43e5e4806c9b95cb692a00 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4570,6 +4570,7 @@ ZEND_VM_HOT_HANDLER(65, ZEND_SEND_VAL, CONST|TMPVAR, CONST|UNUSED|NUM)
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4611,6 +4612,7 @@ ZEND_VM_HOT_SEND_HANDLER(116, ZEND_SEND_VAL_EX, CONST|TMP, CONST|UNUSED|NUM, SPE
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4647,6 +4649,7 @@ ZEND_VM_HOT_HANDLER(117, ZEND_SEND_VAR, VAR|CV, CONST|UNUSED|NUM)
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4693,6 +4696,7 @@ ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR, CONST|UNUSED|NUM)
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4723,6 +4727,7 @@ ZEND_VM_HOT_SEND_HANDLER(50, ZEND_SEND_VAR_NO_REF_EX, VAR, CONST|UNUSED|NUM, SPE
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4790,6 +4795,7 @@ ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, CONST|UNUSED|NUM)
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4819,6 +4825,7 @@ ZEND_VM_HOT_SEND_HANDLER(66, ZEND_SEND_VAR_EX, VAR|CV, CONST|UNUSED|NUM, SPEC(QU
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -4918,6 +4925,7 @@ ZEND_VM_HOT_HANDLER(185, ZEND_SEND_FUNC_ARG, VAR, CONST|UNUSED|NUM)
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       FREE_OP1();
                        HANDLE_EXCEPTION();
                }
        } else {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 34a90d00b0bd991aab681092a572002f162d1a44..31325fb4ab70dd0186aad0319b8a338cb1ed4fd0 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -6072,6 +6072,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_SPEC_CONS
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -6099,6 +6100,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_EX_SPEC_CONST_CONST_H
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -9106,6 +9108,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_SPEC_CONS
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -9133,6 +9136,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_EX_SPEC_CONST_UNUSED_
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -9169,6 +9173,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_EX_SPEC_C
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -14922,6 +14927,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_SPEC_TMPV
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -16724,6 +16730,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_SPEC_TMPV
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -18609,6 +18616,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_EX_SPEC_TMP_CONST_HAN
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -19432,6 +19440,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_EX_SPEC_TMP_UNUSED_HA
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -19468,6 +19477,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAL_EX_SPEC_T
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -23147,6 +23157,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_VAR_
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -23193,6 +23204,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_CONST
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -23223,6 +23235,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_EX_SPEC_VAR_CO
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -23290,6 +23303,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_CONST_HANDLE
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -23319,6 +23333,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_VAR_CONST_HAN
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -23386,6 +23401,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_FUNC_ARG_SPEC
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27019,6 +27035,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_VAR_
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27065,6 +27082,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_SPEC_VAR_UNUSE
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27095,6 +27113,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_EX_SPEC_VAR_UN
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27162,6 +27181,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_NO_REF_EX
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27229,6 +27249,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_VAR_UNUSED_HANDL
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27258,6 +27279,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_VAR_UNUSED_HA
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27324,6 +27346,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_V
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -27391,6 +27414,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_FUNC_ARG_SPEC
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+                       zval_ptr_dtor_nogc(EX_VAR(opline->op1.var));
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -40766,6 +40790,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_CV_C
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -40812,6 +40837,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_CONST_HANDLER
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -40840,6 +40866,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_CV_CONST_HAND
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -45883,6 +45910,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_SPEC_CV_U
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -45929,6 +45957,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_REF_SPEC_CV_UNUSED_HANDLE
                uint32_t arg_num;
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -45957,6 +45986,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_CV_UNUSED_HAN
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {
@@ -46022,6 +46052,7 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_SEND_VAR_EX_SPEC_C
                zend_string *arg_name = Z_STR_P(RT_CONSTANT(opline, opline->op2));
                arg = zend_handle_named_arg(&EX(call), arg_name, &arg_num, CACHE_ADDR(opline->result.num));
                if (UNEXPECTED(!arg)) {
+
                        HANDLE_EXCEPTION();
                }
        } else {