Fix bug #68133 and bug #68135

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index b843f42c418bce213e6ed46602d5e4572a2b2bd4..7fa544b57969d843100ebfb1336be4a4834cf8c8 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -4037,8 +4037,7 @@ ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
 
        ZVAL_UNDEF(&tmp_inc_filename);
        if (Z_TYPE_P(inc_filename) != IS_STRING) {
-               ZVAL_DUP(&tmp_inc_filename, inc_filename);
-               convert_to_string(&tmp_inc_filename);
+               ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
                inc_filename = &tmp_inc_filename;
        }
 

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 82676436b171dd3522810c5ed0d6cd9c4f4fbeb8..9f7d4c3a1a2ad9ae9e7940edc2e9e42f34875b26 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2908,8 +2908,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CONST_HANDLER(ZEND_OPCODE_HA
 
        ZVAL_UNDEF(&tmp_inc_filename);
        if (Z_TYPE_P(inc_filename) != IS_STRING) {
-               ZVAL_DUP(&tmp_inc_filename, inc_filename);
-               convert_to_string(&tmp_inc_filename);
+               ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
                inc_filename = &tmp_inc_filename;
        }
 
@@ -9647,8 +9646,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_TMP_HANDLER(ZEND_OPCODE_HAND
 
        ZVAL_UNDEF(&tmp_inc_filename);
        if (Z_TYPE_P(inc_filename) != IS_STRING) {
-               ZVAL_DUP(&tmp_inc_filename, inc_filename);
-               convert_to_string(&tmp_inc_filename);
+               ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
                inc_filename = &tmp_inc_filename;
        }
 
@@ -16236,8 +16234,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_VAR_HANDLER(ZEND_OPCODE_HAND
 
        ZVAL_UNDEF(&tmp_inc_filename);
        if (Z_TYPE_P(inc_filename) != IS_STRING) {
-               ZVAL_DUP(&tmp_inc_filename, inc_filename);
-               convert_to_string(&tmp_inc_filename);
+               ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
                inc_filename = &tmp_inc_filename;
        }
 
@@ -33518,8 +33515,7 @@ static int ZEND_FASTCALL  ZEND_INCLUDE_OR_EVAL_SPEC_CV_HANDLER(ZEND_OPCODE_HANDL
 
        ZVAL_UNDEF(&tmp_inc_filename);
        if (Z_TYPE_P(inc_filename) != IS_STRING) {
-               ZVAL_DUP(&tmp_inc_filename, inc_filename);
-               convert_to_string(&tmp_inc_filename);
+               ZVAL_STR(&tmp_inc_filename, zval_get_string(inc_filename));
                inc_filename = &tmp_inc_filename;
        }