diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-06 02:31:22 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-06 02:31:22 +0000 |
commit | 008987c958d74dc225cfff96c00fb56611d59539 (patch) | |
tree | 262f76c08767dafd062e225d2386480ec305c9d0 /frame.c | |
parent | 6cb34cdca092b38b41c009caa29b391f4d4d6a8a (diff) |
fix a problem where the frame's data pointer is overwritten by the newly
allocated data buffer before the data can be copied from it. This is in
the ast_frisolate() function which is rarely used. (issue #6732, stefankroon)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@25164 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'frame.c')
-rw-r--r-- | frame.c | 20 |
1 files changed, 12 insertions, 8 deletions
@@ -304,37 +304,41 @@ void ast_frfree(struct ast_frame *fr) struct ast_frame *ast_frisolate(struct ast_frame *fr) { struct ast_frame *out; + void *newdata; + if (!(fr->mallocd & AST_MALLOCD_HDR)) { /* Allocate a new header if needed */ - if (!(out = ast_frame_header_new())) { + if (!(out = ast_frame_header_new())) return NULL; - } out->frametype = fr->frametype; out->subclass = fr->subclass; out->datalen = fr->datalen; out->samples = fr->samples; out->offset = fr->offset; - out->src = NULL; out->data = fr->data; - } else { + } else out = fr; - } + if (!(fr->mallocd & AST_MALLOCD_SRC)) { if (fr->src) out->src = strdup(fr->src); } else out->src = fr->src; + if (!(fr->mallocd & AST_MALLOCD_DATA)) { - if (!(out->data = ast_malloc(fr->datalen + AST_FRIENDLY_OFFSET))) { + if (!(newdata = ast_malloc(fr->datalen + AST_FRIENDLY_OFFSET))) { free(out); return NULL; } - out->data += AST_FRIENDLY_OFFSET; + newdata += AST_FRIENDLY_OFFSET; out->offset = AST_FRIENDLY_OFFSET; out->datalen = fr->datalen; - memcpy(out->data, fr->data, fr->datalen); + memcpy(newdata, fr->data, fr->datalen); + out->data = newdata; } + out->mallocd = AST_MALLOCD_HDR | AST_MALLOCD_SRC | AST_MALLOCD_DATA; + return out; } |