diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-25 22:34:47 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-25 22:34:47 +0000 |
| commit | b26e6286df309cdc170af0ab95061237785754a3 (patch) | |
| tree | fa3aa8122412656fe2ad89373fc332f9bebbc8b0 /main | |
| parent | 8edc74ede6213a02e918456ddb809c8e9c3b7e61 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@231302 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index b586f9785..6f57c7899 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; } |