Fix leak for by-ref assign to overloaded object

Conflicts:
	Zend/zend_vm_execute.h

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 3941df2b6e899c593b02f4e96a95eee667b0b8b5..299067fddec81d53e90eecdeffd30e33d2d80f80 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2312,6 +2312,7 @@ ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV)
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
+               FREE_OP1_VAR_PTR();
                FREE_OP2_VAR_PTR();
                HANDLE_EXCEPTION();
        }

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index d8197ee9f197d3cfe1cc49cb5163c2c343143435..9722cf6fbc5f823b9fb7fbb601beab578955944e 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -18498,6 +18498,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_VAR_HANDLE
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
+               if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
                if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);};
                HANDLE_EXCEPTION();
        }
@@ -20784,6 +20785,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_VAR_CV_HANDLER
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
+               if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);};
 
                HANDLE_EXCEPTION();
        }
@@ -33605,6 +33607,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_VAR_HANDLER
            UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
+
                if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);};
                HANDLE_EXCEPTION();
        }
@@ -37020,6 +37023,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_ASSIGN_REF_SPEC_CV_CV_HANDLER(
            UNEXPECTED(!Z_ISREF_P(EX_VAR(opline->op1.var)))) {
                zend_throw_error(NULL, "Cannot assign by reference to overloaded object");
 
+
                HANDLE_EXCEPTION();
        }
        if (IS_CV == IS_VAR &&