[svn-commits] tilghman: branch 1.6.0 r231300 - in /branches/1.6.0: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Nov 25 16:34:29 2009
New Revision: 231300

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/channel.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

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