kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Might want to update the buffer pointer after a realloc (or we crash)

Browse Source 
(closes issue #14485)
 Reported by: davevg


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@176360 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-02-16 23:48:54 +00:00
parent f8a6cc1ebc
commit 76b100354d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/strings.c
View File

@@ -131,6 +131,7 @@ char *__ast_str_helper2(struct ast_str **buf, size_t maxlen, const char *src, si
(*buf)->__AST_STR_USED++; (*buf)->__AST_STR_USED++;
if (dynamic && (!maxlen || (escapecommas && !(maxlen - 1)))) { if (dynamic && (!maxlen || (escapecommas && !(maxlen - 1)))) {
char *oldbase = (*buf)->__AST_STR_STR;
size_t old = (*buf)->__AST_STR_LEN; size_t old = (*buf)->__AST_STR_LEN;
if (ast_str_make_space(buf, (*buf)->__AST_STR_LEN * 2)) { if (ast_str_make_space(buf, (*buf)->__AST_STR_LEN * 2)) {
/* If the buffer can't be extended, end it. */ /* If the buffer can't be extended, end it. */
@@ -138,6 +139,11 @@ char *__ast_str_helper2(struct ast_str **buf, size_t maxlen, const char *src, si
} }
/* What we extended the buffer by */ /* What we extended the buffer by */
maxlen = old; maxlen = old;
/* Update ptr, if necessary */
if ((*buf)->__AST_STR_STR != oldbase) {
ptr = ptr - oldbase + (*buf)->__AST_STR_STR;
}
} }
} }
if (__builtin_expect(!(maxsrc && maxlen), 0)) { if (__builtin_expect(!(maxsrc && maxlen), 0)) {