From: David Vossel <dvossel@digium.com>
Date: Tue, 18 May 2010 22:49:26 +0000 (+0000)
Subject: Merged revisions 263904 via svnmerge from
X-Git-Tag: 1.6.2.9-rc1~2^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0ee4e0df0592452115b38d41e252626e16a9464;p=thirdparty%2Fasterisk.git

Merged revisions 263904 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r263904 | dvossel | 2010-05-18 17:48:51 -0500 (Tue, 18 May 2010) | 9 lines

  fixes segfault on logging

  (closes issue #17331)
  Reported by: under
  Patches:
        utils.diff uploaded by under (license 914)
        segfault_on_logging.diff uploaded by dvossel (license 671)
  Tested by: under, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@263906 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/strings.c b/main/strings.c
index ce1fbef455..afe56d6f54 100644
--- a/main/strings.c
+++ b/main/strings.c
@@ -77,13 +77,14 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
 		 * reallocate the buffer and return a message telling to retry.
 		 */
 		if (need > (*buf)->__AST_STR_LEN && (max_len == 0 || (*buf)->__AST_STR_LEN < max_len) ) {
+			int len = (int)(*buf)->__AST_STR_LEN;
 			if (max_len && max_len < need) {	/* truncate as needed */
 				need = max_len;
 			} 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)->__AST_STR_LEN, need);
+				ast_verbose("extend from %d to %d\n", len, need);
 			}
 			if (
 #if (defined(MALLOC_DEBUG) && !defined(STANDALONE))
@@ -92,7 +93,7 @@ int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
 					ast_str_make_space(buf, need)
 #endif
 				) {
-				ast_verbose("failed to extend from %d to %d\n", (int)(*buf)->__AST_STR_LEN, need);
+				ast_verbose("failed to extend from %d to %d\n", len, need);
 				va_end(aq);
 				return AST_DYNSTR_BUILD_FAILED;
 			}