diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-16 18:08:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-16 18:08:08 +0800 |
| commit | ce49e6b0f73d9d8b51bd85d40abb5008a496f700 (patch) | |
| tree | ef047eae18ffb76e808bd2d552b72eaad832dd83 /ext/standard/array.c | |
| parent | a16a6eae2400ca27900507a44801645a4b6b3927 (diff) | |
| parent | 78f428d3a825acae74a975747f25cd6782606633 (diff) | |
| download | php-git-ce49e6b0f73d9d8b51bd85d40abb5008a496f700.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |