kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

forgot this part...

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Luigi Rizzo
2006-12-16 11:23:07 +00:00
parent 97ce2f8fd8
commit 2703a1a9df
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/utils.c
View File

@@ -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 (need > (*buf)->len && (max_len == 0 || (*buf)->len < max_len) ) {
if (max_len && max_len < need) /* truncate as needed */ if (max_len && max_len < need) /* truncate as needed */
need = max_len; need = max_len;
else if (max_len == 0) /* if unbounded, give more room for next time */
/* We can only realloc malloc'ed space. */ need += 16 + need/4;
if ((*buf)->ts == DS_ALLOCA || (*buf)->ts == DS_STATIC) 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; return AST_DYNSTR_BUILD_FAILED;
*buf = ast_realloc(*buf, need + sizeof(struct ast_str)); }
if (*buf == NULL) /* XXX watch out, we leak memory here */
return AST_DYNSTR_BUILD_FAILED;
(*buf)->len = need;
(*buf)->str[offset] = '\0'; /* Truncate the partial write. */ (*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 /* va_end() and va_start() must be done before calling
* vsnprintf() again. */ * vsnprintf() again. */
return AST_DYNSTR_BUILD_RETRY; return AST_DYNSTR_BUILD_RETRY;