diff options
| author | Kevin Harwell <kharwell@digium.com> | 2015-02-26 17:12:12 +0000 |
|---|---|---|
| committer | Kevin Harwell <kharwell@digium.com> | 2015-02-26 17:12:12 +0000 |
| commit | d04fbb0f9df89f55d5696024ba9569279109ce90 (patch) | |
| tree | cfeda9f4c07b705b32434575c54383b87704ca7f | |
| parent | 8a16c2f0c24925877ba9e2d38fd0b38248a4ab9e (diff) | |
app_chanspy, channel: fix frame leaks
Fixed a couple of frame leaks that were found during testing.
ASTERISK-24828 #close
Reported by: John Hardin
Review: https://reviewboard.asterisk.org/r/4445/
........
Merged revisions 432362 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 432363 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | apps/app_chanspy.c | 3 | ||||
| -rw-r--r-- | main/channel.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 3777c48e9..9080594bf 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -698,6 +698,9 @@ static int channel_spy(struct ast_channel *chan, struct ast_autochan *spyee_auto while (ast_waitfor(chan, -1) > -1 && csth.spy_audiohook.status == AST_AUDIOHOOK_STATUS_RUNNING) { if (!(f = ast_read(chan)) || ast_check_hangup(chan)) { running = -1; + if (f) { + ast_frfree(f); + } break; } diff --git a/main/channel.c b/main/channel.c index b35a2fad4..76b6d524a 100644 --- a/main/channel.c +++ b/main/channel.c @@ -2827,14 +2827,14 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay) } } - if (res == 0) { - ast_channel_lock(chan); - while ((cur = AST_LIST_REMOVE_HEAD(&frames, frame_list))) { + ast_channel_lock(chan); + while ((cur = AST_LIST_REMOVE_HEAD(&frames, frame_list))) { + if (res == 0) { ast_queue_frame_head(chan, cur); - ast_frfree(cur); } - ast_channel_unlock(chan); + ast_frfree(cur); } + ast_channel_unlock(chan); } while (0); break; default: |