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 | |
| 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')
| -rw-r--r-- | ext/standard/array.c | 2 | ||||
| -rw-r--r-- | ext/standard/formatted_print.c | 16 |
2 files changed, 9 insertions, 9 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; diff --git a/ext/standard/formatted_print.c b/ext/standard/formatted_print.c index 1f5a93fcb0..2e6e2f672b 100644 --- a/ext/standard/formatted_print.c +++ b/ext/standard/formatted_print.c @@ -393,23 +393,23 @@ php_formatted_print(int param_count, int use_array, int format_offset TSRMLS_DC) if (use_array) { int i = 1; zval *zv; - zval array; + zval *array; z_format = &args[format_offset]; - ZVAL_DUP(&array, &args[1 + format_offset]); - convert_to_array_ex(&array); + array = &args[1 + format_offset]; + SEPARATE_ZVAL(array); + convert_to_array_ex(array); - argc = 1 + zend_hash_num_elements(Z_ARRVAL(array)); + argc = 1 + zend_hash_num_elements(Z_ARRVAL_P(array)); newargs = (zval *)safe_emalloc(argc, sizeof(zval), 0); ZVAL_COPY_VALUE(&newargs[0], z_format); - for (zend_hash_internal_pointer_reset(Z_ARRVAL(array)); - (zv = zend_hash_get_current_data(Z_ARRVAL(array))) != NULL; - zend_hash_move_forward(Z_ARRVAL(array))) { + for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(array)); + (zv = zend_hash_get_current_data(Z_ARRVAL_P(array))) != NULL; + zend_hash_move_forward(Z_ARRVAL_P(array))) { ZVAL_COPY_VALUE(&newargs[i], zv); i++; } - zval_dtor(&array); args = newargs; format_offset = 0; } |