diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-25 22:34:29 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-25 22:34:29 +0000 |
| commit | 68ef0e58ad3500d5265ef15e7a4e5cfb1474abc3 (patch) | |
| tree | 9fcc76946d7138ffb9c35bcc9a7713e6f242f319 | |
| parent | a1c5d1a70cc197f9f025fa318567a8664c1a0452 (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.0@231300 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 55369c7bf..ceb861181 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1009,6 +1009,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; } |