From: Kevin Harwell <kharwell@digium.com>
Date: Thu, 26 Feb 2015 17:06:01 +0000 (+0000)
Subject: app_chanspy, channel: fix frame leaks
X-Git-Tag: 11.17.0-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9445a451881f77356bb1f1e29b403e09615e2a8a;p=thirdparty%2Fasterisk.git

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/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@432362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 37dd148f8d..31a1e18ca2 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -648,6 +648,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 8be8fe7a31..c89cd725e4 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3033,14 +3033,14 @@ int __ast_answer(struct ast_channel *chan, unsigned int delay, int cdr_answer)
 				}
 			}
 
-			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: