diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-06-05 16:04:11 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-06-05 16:04:11 +0400 |
| commit | c1965f58d4dd3970912dcd6a63ccd5860bae1a97 (patch) | |
| tree | 15b4a94e8e8405f791438c468ad4eb03f60c4079 /ext/mbstring/mbstring.c | |
| parent | 3d87391cc06fe87344536e88ac74ded22b0195cf (diff) | |
| download | php-git-c1965f58d4dd3970912dcd6a63ccd5860bae1a97.tar.gz | |
Use reference counting instead of zval duplication
Diffstat (limited to 'ext/mbstring/mbstring.c')
| -rw-r--r-- | ext/mbstring/mbstring.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index 54bd34fa7a..ebea66323c 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -2059,13 +2059,12 @@ PHP_FUNCTION(mb_parse_str) const mbfl_encoding *detected; track_vars_array = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z", &encstr, &encstr_len, &track_vars_array) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/", &encstr, &encstr_len, &track_vars_array) == FAILURE) { return; } if (track_vars_array != NULL) { /* Clear out the array */ - ZVAL_DEREF(track_vars_array); zval_dtor(track_vars_array); array_init(track_vars_array); } @@ -3600,6 +3599,7 @@ PHP_FUNCTION(mb_convert_variables) if (stack_level <= 0) { var = &args[n++]; ZVAL_DEREF(var); + SEPARATE_ZVAL_NOREF(var); if (Z_TYPE_P(var) == IS_ARRAY || Z_TYPE_P(var) == IS_OBJECT) { target_hash = HASH_OF(var); if (target_hash != NULL) { @@ -3686,6 +3686,7 @@ detect_end: if (stack_level <= 0) { var = &args[n++]; ZVAL_DEREF(var); + SEPARATE_ZVAL_NOREF(var); if (Z_TYPE_P(var) == IS_ARRAY || Z_TYPE_P(var) == IS_OBJECT) { target_hash = HASH_OF(var); if (target_hash != NULL) { |