From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 16 Apr 2014 08:07:21 +0000 (+0400)
Subject: Fixed zend_string/char mess
X-Git-Tag: POST_PHPNG_MERGE~412^2~84^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=153e549886ef775c4c15037bbcc6b1b9f360b282;p=php

Fixed zend_string/char mess
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9ddb234186..20ad3d9986 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1823,7 +1823,7 @@ static void php_array_data_shuffle(zval *array TSRMLS_DC) /* {{{ */
 	for (j = 0; j < n_elems; j++) {
 		p = hash->arData + j;
 		if (p->key && !IS_INTERNED(p->key)) {
-			pefree((char*)p->key, hash->flags & HASH_FLAG_PERSISTENT);
+			STR_RELEASE(p->key);
 		}
 		p->h = j;
 		p->key = NULL;