[svn-commits] tilghman: trunk r231299 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Nov 25 16:33:02 2009
New Revision: 231299

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=231299
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=231299&r1=231298&r2=231299
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Wed Nov 25 16:33:02 2009
@@ -1084,6 +1084,7 @@
 	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;
 		}