kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 288006 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r288006 | bbryant | 2010-09-21 15:46:20 -0400 (Tue, 21 Sep 2010) | 14 lines
  
  Merged revisions 288005 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r288005 | bbryant | 2010-09-21 15:43:46 -0400 (Tue, 21 Sep 2010) | 8 lines
    
    Add a check to fix a rare segmentation fault you'd get if ast_frdup couldn't allocate
    memory on the first frame being queued in ast_queue_frame.
    
    (closes issue #17882)
    Reported by: seanbright
    Tested by: seanbright
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@288007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Brett Bryant
2010-09-21 19:48:53 +00:00
parent 74e9d2b239
commit 1c4aabd5d6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/channel.c
View File

@@ -1366,7 +1366,9 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in
AST_LIST_HEAD_INIT_NOLOCK(&frames);
for (cur = fin; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
if (!(f = ast_frdup(cur))) {
ast_frfree(AST_LIST_FIRST(&frames));
if (AST_LIST_FIRST(&frames)) {
ast_frfree(AST_LIST_FIRST(&frames));
}
ast_channel_unlock(chan);
return -1;
}