From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 30 Jul 2019 08:07:25 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14f99ede42ff8a5824aae0b5927288190c5a961a;p=php

Merge branch 'PHP-7.4'
---

14f99ede42ff8a5824aae0b5927288190c5a961a
diff --cc Zend/zend_vm_execute.h
index 8cbd2011c2,23d41dbdbd..a2915ab64b
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -1837,7 -1862,11 +1837,11 @@@ static ZEND_OPCODE_HANDLER_RET ZEND_FAS
  	int arg_num;
  
  	SAVE_OPLINE();
- 	args = get_zval_ptr_undef(opline->op1_type, opline->op1, BP_VAR_R);
+ 	if (opline->op1_type & (IS_VAR|IS_CV)) {
 -		args = get_zval_ptr_ptr_undef(opline->op1_type, opline->op1, &free_op1, BP_VAR_RW);
++		args = get_zval_ptr_ptr_undef(opline->op1_type, opline->op1, BP_VAR_RW);
+ 	} else {
 -		args = get_zval_ptr_undef(opline->op1_type, opline->op1, &free_op1, BP_VAR_R);
++		args = get_zval_ptr_undef(opline->op1_type, opline->op1, BP_VAR_R);
+ 	}
  	arg_num = ZEND_CALL_NUM_ARGS(EX(call)) + 1;
  
  send_again: