diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 18:12:27 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-26 18:12:27 +0000 |
commit | e5afa7657c1dd01c941696500f23f9e5a77b0697 (patch) | |
tree | 8f7a08823938b9c697fb8cd18d1d06c32ed0fc8d /main | |
parent | 1cf4c08e6202337309488690a90b6ac6d505d547 (diff) |
Merged revisions 243244 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r243244 | jpeeler | 2010-01-26 12:07:57 -0600 (Tue, 26 Jan 2010) | 12 lines
Fix crash resulting from frames with invalid data pointers.
In ast_frdup the frame data union does not get set to point to malloced memory
if the datalen is zero, so make sure to handle the same case in ast_frisolate
appropriately.
(closes issue #16058)
Reported by: atis
Patches:
bug16058-fix.patch uploaded by jpeeler (license 325)
Tested by: atis
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@243246 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/frame.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/frame.c b/main/frame.c index 16f5d5a58..b38f2df9e 100644 --- a/main/frame.c +++ b/main/frame.c @@ -431,6 +431,11 @@ struct ast_frame *ast_frisolate(struct ast_frame *fr) } if (!(fr->mallocd & AST_MALLOCD_DATA)) { + if (!fr->datalen) { + out->data.uint32 = fr->data.uint32; + out->mallocd = AST_MALLOCD_HDR | AST_MALLOCD_SRC; + return out; + } if (!(newdata = ast_malloc(fr->datalen + AST_FRIENDLY_OFFSET))) { if (out->src != fr->src) { ast_free((void *) out->src); |