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.1@231301 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/channel.c b/main/channel.c
index 3f9f16178e0050383e442df11107594e0216d27f..41748df767bd4fd57cd8e19d686e64b9a437c05c 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1008,6 +1008,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;
                }