dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

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: http://svn.digium.com/svn/asterisk/trunk@263904 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
dvossel 2010-05-18 22:48:51 +00:00
parent 7589501b6f
commit 6a06329e28
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/strings.c
View 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) ) {
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;
}