[asterisk-commits] file: trunk r404333 - in /trunk: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Dec 19 06:18:52 2013
New Revision: 404333

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404333
Log:
channel: Add a missing ast_channel_unlock when allocating a Surrogate channel.
........

Merged revisions 404332 from http://svn.asterisk.org/svn/asterisk/branches/12

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Dec 19 06:18:52 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029,404042,404046,404048,404050,404099,404137,404184,404204,404237,404261,404263,404279,404292,404294,404306,404320
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404006,404027,404029,404042,404046,404048,404050,404099,404137,404184,404204,404237,404261,404263,404279,404292,404294,404306,404320,404332

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=404333&r1=404332&r2=404333
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Thu Dec 19 06:18:52 2013
@@ -10355,6 +10355,8 @@
 	ast_format_copy(ast_channel_readformat(yanked_chan), &my_vars.readformat);
 	ast_format_copy(ast_channel_writeformat(yanked_chan), &my_vars.writeformat);
 
+	ast_channel_unlock(yanked_chan);
+
 	if (ast_channel_move(yanked_chan, yankee)) {
 		ast_hangup(yanked_chan);
 		return NULL;