From 2703a1a9df44f121e3ac24416b284d13c12decb8 Mon Sep 17 00:00:00 2001
From: Luigi Rizzo <rizzo@icir.org>
Date: Sat, 16 Dec 2006 11:23:07 +0000
Subject: [PATCH] forgot this part...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48520 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/utils.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/main/utils.c b/main/utils.c
index 65d6d20d6a..6728fce7e1 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;
--
GitLab