Fix -a interactive mode (no idea how the previous commit got committed)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index c7f4d759c18d46dd891eb6be60e943c93e1cea86..f4c3d030ba90cc4e2d38fc36e6503fd77b3cff5a 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2326,10 +2326,7 @@ send_by_ref:
                }
        }
 #if SUPPORT_INTERACTIVE
-       ALLOC_ZVAL(*(EG(return_value_ptr_ptr)));
-       **EG(return_value_ptr_ptr) = *retval_ptr;
-       (*EG(return_value_ptr_ptr))->refcount = 1;
-       (*EG(return_value_ptr_ptr))->is_ref = 0;
+       ALLOC_INIT_ZVAL(*(EG(return_value_ptr_ptr)));
        op_array->last_executed_op_number = opline-op_array->opcodes;
        EG(in_execution) = original_in_execution;
        free_alloca(Ts);

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index fc17c591bd4c5a39305bc011bf8a669764592c99..9834499195945fed67408f7b14aa312df4a0e690 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -540,6 +540,7 @@ void execute_new_code(CLS_D)
        CG(active_op_array)->end_op_number = CG(active_op_array)->last;
        EG(active_op_array) = CG(active_op_array);
        zend_execute(CG(active_op_array) ELS_CC);
+       zval_ptr_dtor(EG(return_value_ptr_ptr));
        CG(active_op_array)->start_op_number = CG(active_op_array)->last_executed_op_number;
 }
 #endif