[svn-commits] wedhorn: trunk r406988 - in /trunk: ./ channels/chan_skinny.c

[SVN commits to the Digium repositories]

Author: wedhorn
Date: Thu Jan 30 23:31:45 2014
New Revision: 406988

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406988
Log:
Skinny: fix up possible double unlock of chan.

Return before chan is possibly unlocked a second time when hanging up
a channel in SUBSTATE_OFFHOOK.
........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_skinny.c

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

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=406988&r1=406987&r2=406988
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Thu Jan 30 23:31:45 2014
@@ -5799,6 +5799,7 @@
 				sub->substate = SUBSTATE_ONHOOK;
 				skinny_unlocksub(sub);
 				ast_hangup(sub->owner);
+				return;
 			} else {
 				sub->substate = SUBSTATE_ONHOOK;
 				ast_queue_hangup(sub->owner);