From: Xinchen Hui <laruence@php.net>
Date: Wed, 6 May 2015 03:10:33 +0000 (+0800)
Subject: Use Z_ARRVAL_P since we already know it's an array
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f0dbdf6c882e476bbad1fe8d42ef7c39362f3fa;p=php

Use Z_ARRVAL_P since we already know it's an array
---

diff --git a/ext/json/json_encoder.c b/ext/json/json_encoder.c
index 11630c9e58..d9bfb16e5b 100644
--- a/ext/json/json_encoder.c
+++ b/ext/json/json_encoder.c
@@ -46,7 +46,7 @@ static void php_json_escape_string(smart_str *buf, char *s, size_t len, int opti
 static int php_json_determine_array_type(zval *val) /* {{{ */
 {
 	int i;
-	HashTable *myht = HASH_OF(val);
+	HashTable *myht = Z_ARRVAL_P(val);
 
 	i = myht ? zend_hash_num_elements(myht) : 0;
 	if (i > 0) {
@@ -121,7 +121,7 @@ static void php_json_encode_array(smart_str *buf, zval *val, int options) /* {{{
 	HashTable *myht;
 
 	if (Z_TYPE_P(val) == IS_ARRAY) {
-		myht = HASH_OF(val);
+		myht = Z_ARRVAL_P(val);
 		r = (options & PHP_JSON_FORCE_OBJECT) ? PHP_JSON_OUTPUT_OBJECT : php_json_determine_array_type(val);
 	} else {
 		myht = Z_OBJPROP_P(val);
@@ -450,7 +450,7 @@ static void php_json_encode_serializable_object(smart_str *buf, zval *val, int o
 	HashTable* myht;
 
 	if (Z_TYPE_P(val) == IS_ARRAY) {
-		myht = HASH_OF(val);
+		myht = Z_ARRVAL_P(val);
 	} else {
 		myht = Z_OBJPROP_P(val);
 	}