From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 10 Jul 2018 09:11:10 +0000 (+0300)
Subject: Use ZVAL_COPY_DEREF()
X-Git-Tag: php-7.3.0alpha4~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7da042cbd8381ba9e21caeec4f1d0fe08c289e44;p=php

Use ZVAL_COPY_DEREF()
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cb1d451787..68a6eec138 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -915,8 +915,7 @@ ZEND_API int zend_std_has_dimension(zval *object, zval *offset, int check_empty)
 	int result;
 
 	if (EXPECTED(instanceof_function_ex(ce, zend_ce_arrayaccess, 1) != 0)) {
-		ZVAL_DEREF(offset);
-		ZVAL_COPY(&tmp_offset, offset);
+		ZVAL_COPY_DEREF(&tmp_offset, offset);
 		ZVAL_COPY(&tmp_object, object);
 		zend_call_method_with_1_params(&tmp_object, ce, NULL, "offsetexists", &retval, &tmp_offset);
 		if (EXPECTED(Z_TYPE(retval) != IS_UNDEF)) {