]> granicus.if.org Git - php/commitdiff
Delay dereference
authorDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 15:36:50 +0000 (18:36 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 24 Jul 2019 15:36:50 +0000 (18:36 +0300)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

index a86813412d090458c76c588975fa7a05130a63ad..2314681671ba22b8a41aef69f85dbf0e21925509 100644 (file)
@@ -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);
index eb95d3bd4466a8a6d532116d5f4a8f3c4917aae6..ef539601295294ca8d2de5be480a7c4add050a0c 100644 (file)
@@ -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);