com php-src: Fixed zend_string/char mess: ext/standard/ array.c
| From: | Dmitry Stogov | Date: | Wed, 16 Apr 2014 08:07:21 +0000 |
| Subject: | com php-src: Fixed zend_string/char mess: ext/standard/ array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77383@lists.php.net to get a copy of this message | ||
Commit: 153e549886ef775c4c15037bbcc6b1b9f360b282
Author: Dmitry Stogov <dmitry@zend.com> Wed, 16 Apr 2014 12:07:21 +0400
Parents: dce95c064f7c8cc29e7ec55e29346256fbd240d9
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=153e549886ef775c4c15037bbcc6b1b9f360b282
Log:
Fixed zend_string/char mess
Changed paths:
M ext/standard/array.c
Diff:
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 9ddb234..20ad3d9 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;