diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-12-16 11:23:07 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-12-16 11:23:07 +0000 |
commit | 2703a1a9df44f121e3ac24416b284d13c12decb8 (patch) | |
tree | a216720663ca64f151fddb0f04eafb88c40b204a /main/utils.c | |
parent | 97ce2f8fd882c5eb8a1c8065602cce39a29f3dfe (diff) |
forgot this part...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/utils.c')
-rw-r--r-- | main/utils.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/main/utils.c b/main/utils.c index 65d6d20d6..6728fce7e 100644 --- a/main/utils.c +++ b/main/utils.c @@ -1003,20 +1003,16 @@ int __ast_str_helper(struct ast_str **buf, size_t max_len, if (need > (*buf)->len && (max_len == 0 || (*buf)->len < max_len) ) { if (max_len && max_len < need) /* truncate as needed */ need = max_len; - - /* We can only realloc malloc'ed space. */ - if ((*buf)->ts == DS_ALLOCA || (*buf)->ts == DS_STATIC) - return AST_DYNSTR_BUILD_FAILED; - *buf = ast_realloc(*buf, need + sizeof(struct ast_str)); - if (*buf == NULL) /* XXX watch out, we leak memory here */ + else if (max_len == 0) /* if unbounded, give more room for next time */ + need += 16 + need/4; + if (0) /* debugging */ + ast_verbose("extend from %d to %d\n", (int)(*buf)->len, need); + if (ast_str_make_space(buf, need)) { + ast_verbose("failed to extend from %d to %d\n", (int)(*buf)->len, need); return AST_DYNSTR_BUILD_FAILED; - (*buf)->len = need; - + } (*buf)->str[offset] = '\0'; /* Truncate the partial write. */ - if ((*buf)->ts != DS_ALLOCA) - pthread_setspecific((*buf)->ts->key, *buf); - /* va_end() and va_start() must be done before calling * vsnprintf() again. */ return AST_DYNSTR_BUILD_RETRY; |