From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 25 Nov 2009 22:33:02 +0000 (+0000)
Subject: Merged revisions 231298 via svnmerge from
X-Git-Tag: 11.0.0-beta1~3826
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f98c12a57df256e41cae33a3decd4b65fb0a4f46;p=thirdparty%2Fasterisk.git

Merged revisions 231298 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r231298 | tilghman | 2009-11-25 16:31:57 -0600 (Wed, 25 Nov 2009) | 2 lines

  After a frame duplication failure, unlock the channel before returning.
........


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

diff --git a/main/channel.c b/main/channel.c
index 5b58b76bd7..48eedafe76 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1084,6 +1084,7 @@ static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, in
 	for (cur = fin; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
 		if (!(f = ast_frdup(cur))) {
 			ast_frfree(AST_LIST_FIRST(&frames));
+			ast_channel_unlock(chan);
 			return -1;
 		}