From 22e7ee3bb3ada369112f7ba6cf552ec9882e466b Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 24 Jul 2019 18:36:50 +0300 Subject: [PATCH] Delay dereference --- Zend/zend_vm_def.h | 2 +- Zend/zend_vm_execute.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index a86813412d..2314681671 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -5101,7 +5101,7 @@ ZEND_VM_C_LABEL(send_array): ht = Z_ARRVAL_P(args); if (OP2_TYPE != IS_UNUSED) { zend_free_op free_op2; - zval *op2 = GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R); + zval *op2 = GET_OP2_ZVAL_PTR(BP_VAR_R); uint32_t skip = opline->extended_value; uint32_t count = zend_hash_num_elements(ht); zend_long len = zval_get_long(op2); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index eb95d3bd44..ef53960129 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2043,7 +2043,7 @@ send_array: ht = Z_ARRVAL_P(args); if (opline->op2_type != IS_UNUSED) { zend_free_op free_op2; - zval *op2 = get_zval_ptr_deref(opline->op2_type, opline->op2, &free_op2, BP_VAR_R); + zval *op2 = get_zval_ptr(opline->op2_type, opline->op2, &free_op2, BP_VAR_R); uint32_t skip = opline->extended_value; uint32_t count = zend_hash_num_elements(ht); zend_long len = zval_get_long(op2); -- 2.50.1