From f1204f9ebf280f1c333d08d5ec73a1c515f4d5d8 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Wed, 25 Nov 2009 22:34:47 +0000 Subject: [PATCH] Merged revisions 231299 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r231299 | tilghman | 2009-11-25 16:33:02 -0600 (Wed, 25 Nov 2009) | 9 lines 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/branches/1.6.2@231302 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/channel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/main/channel.c b/main/channel.c index b586f9785b..6f57c7899f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1013,6 +1013,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; }