php
diff --git a/‎Zend/zend_vm_def.h‎
Lines changed: 3 additions & 2 deletions b/‎Zend/zend_vm_def.h‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎Zend/zend_vm_execute.h‎
Lines changed: 27 additions & 18 deletions b/‎Zend/zend_vm_execute.h‎
Lines changed: 27 additions & 18 deletions
@@ -3240,6 +3240,8 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(53, ZEND_FAST_CONCAT, CONST|TMPVAR|CV, CONST|TMP
 {
 	USE_OPLINE
 	zval *op1, *op2;
+	zend_string *op1_str, *op2_str, *str;
+
 
 	op1 = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);
 	op2 = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);
@@ -3296,7 +3298,6 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(53, ZEND_FAST_CONCAT, CONST|TMPVAR|CV, CONST|TMP
 	}
 
 	SAVE_OPLINE();
-	zend_string *op1_str, *op2_str;
 	if (OP1_TYPE == IS_CONST) {
 		op1_str = Z_STR_P(op1);
 	} else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {
@@ -3342,7 +3343,7 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(53, ZEND_FAST_CONCAT, CONST|TMPVAR|CV, CONST|TMP
 				break;
 			}
 		}
-		zend_string *str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);
+		str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);
 		memcpy(ZSTR_VAL(str), ZSTR_VAL(op1_str), ZSTR_LEN(op1_str));
 		memcpy(ZSTR_VAL(str) + ZSTR_LEN(op1_str), ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);
Original file line number	Diff line number	Diff line change
`@@ -3240,6 +3240,8 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(53, ZEND_FAST_CONCAT, CONST\|TMPVAR\|CV, CONST\|TMP`
`3240`	`3240`	`{`
`3241`	`3241`	`USE_OPLINE`
`3242`	`3242`	`zval op1, op2;`
	`3243`	`+ zend_string op1_str, op2_str, *str;`
	`3244`	`+`
`3243`	`3245`
`3244`	`3246`	`op1 = GET_OP1_ZVAL_PTR_UNDEF(BP_VAR_R);`
`3245`	`3247`	`op2 = GET_OP2_ZVAL_PTR_UNDEF(BP_VAR_R);`
`@@ -3296,7 +3298,6 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(53, ZEND_FAST_CONCAT, CONST\|TMPVAR\|CV, CONST\|TMP`
`3296`	`3298`	`}`
`3297`	`3299`
`3298`	`3300`	`SAVE_OPLINE();`
`3299`		`- zend_string op1_str, op2_str;`
`3300`	`3301`	`if (OP1_TYPE == IS_CONST) {`
`3301`	`3302`	`op1_str = Z_STR_P(op1);`
`3302`	`3303`	`} else if (EXPECTED(Z_TYPE_P(op1) == IS_STRING)) {`
`@@ -3342,7 +3343,7 @@ ZEND_VM_COLD_CONSTCONST_HANDLER(53, ZEND_FAST_CONCAT, CONST\|TMPVAR\|CV, CONST\|TMP`
`3342`	`3343`	`break;`
`3343`	`3344`	`}`
`3344`	`3345`	`}`
`3345`		`- zend_string *str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);`
	`3346`	`+ str = zend_string_alloc(ZSTR_LEN(op1_str) + ZSTR_LEN(op2_str), 0);`
`3346`	`3347`	`memcpy(ZSTR_VAL(str), ZSTR_VAL(op1_str), ZSTR_LEN(op1_str));`
`3347`	`3348`	`memcpy(ZSTR_VAL(str) + ZSTR_LEN(op1_str), ZSTR_VAL(op2_str), ZSTR_LEN(op2_str)+1);`
`3348`	`3349`