diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-02-25 15:47:24 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-02-25 15:47:24 +0800 |
| commit | 71dac3d54f8c3dd80d5669846601a6980a7c3067 (patch) | |
| tree | f6ab7ec7d1a2d5a5a83eef9114a548413b3c79c3 /Zend/zend_API.c | |
| parent | bfcb3defdda99345e42cfa2988f6312fdfc5b7ed (diff) | |
| download | php-git-71dac3d54f8c3dd80d5669846601a6980a7c3067.tar.gz | |
Don't add_ref in add_*_str functions
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 455fe5412f..77d80cc44e 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -1339,7 +1339,6 @@ ZEND_API int add_assoc_str_ex(zval *arg, const char *key, uint key_len, zend_str zval *ret, tmp; ZVAL_STR(&tmp, str); - STR_ADDREF(str); ret = zend_symtable_str_update(Z_ARRVAL_P(arg), key, key_len, &tmp); return ret ? SUCCESS : FAILURE; } @@ -1506,7 +1505,7 @@ ZEND_API int add_next_index_str(zval *arg, zend_string *str) /* {{{ */ { zval tmp; - ZVAL_STR(&tmp, STR_COPY(str)); + ZVAL_STR(&tmp, str); return zend_hash_next_index_insert(Z_ARRVAL_P(arg), &tmp) ? SUCCESS : FAILURE; } /* }}} */ @@ -1582,7 +1581,7 @@ ZEND_API zval *add_get_index_str(zval *arg, ulong index, zend_string *str) /* {{ zval tmp; //??? ZVAL_STRING(tmp, str, duplicate); - ZVAL_STR(&tmp, STR_COPY(str)); + ZVAL_STR(&tmp, str); return zend_hash_index_update(Z_ARRVAL_P(arg), index, &tmp); } /* }}} */ @@ -3297,8 +3296,8 @@ ZEND_API zend_bool zend_make_callable(zval *callable, char **callable_name TSRML if (Z_TYPE_P(callable) == IS_STRING && fcc.calling_scope) { zval_dtor(callable); array_init(callable); - add_next_index_str(callable, fcc.calling_scope->name); - add_next_index_str(callable, fcc.function_handler->common.function_name); + add_next_index_str(callable, STR_COPY(fcc.calling_scope->name)); + add_next_index_str(callable, STR_COPY(fcc.function_handler->common.function_name)); } if (fcc.function_handler && ((fcc.function_handler->type == ZEND_INTERNAL_FUNCTION && |