diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-20 22:10:54 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-20 22:10:54 +0000 |
| commit | 130bfa65a52b87d20852ec761b6224192abb586f (patch) | |
| tree | 2712a4635f81d9739e00eff4828fe70f2ea36792 /main | |
| parent | fe1b795950dd271013118d153e9b000581a21173 (diff) | |
Merged revisions 224856 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@224857 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/audiohook.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/main/audiohook.c b/main/audiohook.c index 4df92e56d..ef508a7ff 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -574,7 +574,7 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st struct ast_frame *start_frame = frame, *middle_frame = frame, *end_frame = frame; struct ast_audiohook *audiohook = NULL; int samples = frame->samples; - + /* If the frame coming in is not signed linear we have to send it through the in_translate path */ if (frame->subclass != AST_FORMAT_SLINEAR) { if (in_translate->format != frame->subclass) { @@ -645,11 +645,16 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st continue; } /* 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_LIST_TRAVERSE_SAFE_END - end_frame = middle_frame; + if (middle_frame) { + end_frame = middle_frame; + } } /* Now we figure out what to do with our end frame (whether to transcode or not) */ @@ -677,7 +682,9 @@ static struct ast_frame *audio_audiohook_write_list(struct ast_channel *chan, st } } else { /* No frame was modified, we can just drop our middle frame and pass the frame we got in out */ - ast_frfree(middle_frame); + if (middle_frame) { + ast_frfree(middle_frame); + } } return end_frame; |