kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 04:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 243244 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@243246 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-01-26 18:12:27 +00:00
parent d20bd77c11
commit 247ee74e7a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/frame.c
View File

@@ -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);