fixes segfault on logging
authorDavid Vossel <dvossel@digium.com>
Tue, 18 May 2010 22:48:51 +0000 (22:48 +0000)
committerDavid Vossel <dvossel@digium.com>
Tue, 18 May 2010 22:48:51 +0000 (22:48 +0000)
(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/trunk@263904 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/strings.c

index 6167e9b..10c1c42 100644 (file)
@@ -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) ) {
                 * 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 */
                        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))
                        }
                        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_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;
                        }
                                va_end(aq);
                                return AST_DYNSTR_BUILD_FAILED;
                        }