make sure return_value_used is always initialized

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index cf8c4b97649e3c715e7cccfccfd077e6069d2a82..dbf7de89d7d05ebfae775a2fafe84381be91b23d 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2748,7 +2748,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
        zend_op *opline = EX(opline);
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
-       int return_value_used;
+       int return_value_used = RETURN_VALUE_USED(opline);
        zend_free_op free_op1;
        zval *inc_filename = GET_OP1_ZVAL_PTR(BP_VAR_R);
        zval tmp_inc_filename;
@@ -2780,8 +2780,6 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
                inc_filename = &tmp_inc_filename;
        }
 
-       return_value_used = RETURN_VALUE_USED(opline);
-
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 34ab6f4f0a83572d49b34d28df19ae76bd7844b8..57717550aa38a814f18c502bba853606cc479cc2 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1857,7 +1857,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
-       int return_value_used;
+       int return_value_used = RETURN_VALUE_USED(opline);
 
        zval *inc_filename = &opline->op1.u.constant;
        zval tmp_inc_filename;
@@ -1889,8 +1889,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                inc_filename = &tmp_inc_filename;
        }
 
-       return_value_used = RETURN_VALUE_USED(opline);
-
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
@@ -4437,7 +4435,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
-       int return_value_used;
+       int return_value_used = RETURN_VALUE_USED(opline);
        zend_free_op free_op1;
        zval *inc_filename = _get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval tmp_inc_filename;
@@ -4469,8 +4467,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                inc_filename = &tmp_inc_filename;
        }
 
-       return_value_used = RETURN_VALUE_USED(opline);
-
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
@@ -7614,7 +7610,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
-       int return_value_used;
+       int return_value_used = RETURN_VALUE_USED(opline);
        zend_free_op free_op1;
        zval *inc_filename = _get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC);
        zval tmp_inc_filename;
@@ -7646,8 +7642,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                inc_filename = &tmp_inc_filename;
        }
 
-       return_value_used = RETURN_VALUE_USED(opline);
-
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {
@@ -20387,7 +20381,7 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
        zend_op *opline = EX(opline);
        zend_op_array *new_op_array=NULL;
        zval **original_return_value = EG(return_value_ptr_ptr);
-       int return_value_used;
+       int return_value_used = RETURN_VALUE_USED(opline);
 
        zval *inc_filename = _get_zval_ptr_cv(&opline->op1, EX(Ts), BP_VAR_R TSRMLS_CC);
        zval tmp_inc_filename;
@@ -20419,8 +20413,6 @@ static int ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
                inc_filename = &tmp_inc_filename;
        }
 
-       return_value_used = RETURN_VALUE_USED(opline);
-
        switch (Z_LVAL(opline->op2.u.constant)) {
                case ZEND_INCLUDE_ONCE:
                case ZEND_REQUIRE_ONCE: {