kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 224856 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r224856 | tilghman | 2009-10-20 17:09:07 -0500 (Tue, 20 Oct 2009) | 12 lines
  
  Merged revisions 224855 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r224855 | tilghman | 2009-10-20 17:07:11 -0500 (Tue, 20 Oct 2009) | 5 lines
    
    Pay attention to the return value of the manipulate function.
    While this looks like an optimization, it prevents a crash from occurring
    when used with certain audiohook callbacks (diagnosed with SVN trunk,
    backported to 1.4 to keep the source consistent across versions).
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@224857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-10-20 22:10:54 +00:00
parent 2edc76e63c
commit 0f2eec5ab0
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/audiohook.c
View File

@@ -645,12 +645,17 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st
continue; continue;
} }
/* Feed in frame to manipulation */ /* Feed in frame to manipulation */
audiohook->manipulate_callback(audiohook, chan, middle_frame, direction); if (audiohook->manipulate_callback(audiohook, chan, middle_frame, direction)) {
ast_frfree(middle_frame);
middle_frame = NULL;
}
ast_audiohook_unlock(audiohook); ast_audiohook_unlock(audiohook);
} }
AST_LIST_TRAVERSE_SAFE_END AST_LIST_TRAVERSE_SAFE_END
if (middle_frame) {
end_frame = middle_frame; end_frame = middle_frame;
} }
}
/* Now we figure out what to do with our end frame (whether to transcode or not) */ /* Now we figure out what to do with our end frame (whether to transcode or not) */
if (middle_frame == end_frame) { if (middle_frame == end_frame) {
@@ -677,8 +682,10 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st
} }
} else { } else {
/* No frame was modified, we can just drop our middle frame and pass the frame we got in out */ /* No frame was modified, we can just drop our middle frame and pass the frame we got in out */
if (middle_frame) {
ast_frfree(middle_frame); ast_frfree(middle_frame);
} }
}
return end_frame; return end_frame;
} }