[asterisk-commits] mmichelson: branch 1.6.0 r109027 - in /branches/1.6.0: ./ apps/app_chanspy.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Mar 17 09:21:48 2008
New Revision: 109027

URL: http://svn.digium.com/view/asterisk?view=rev&rev=109027
Log:
Merged revisions 109024 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r109024 | mmichelson | 2008-03-17 09:21:14 -0500 (Mon, 17 Mar 2008) | 14 lines

Merged revisions 109012 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r109012 | mmichelson | 2008-03-17 09:18:26 -0500 (Mon, 17 Mar 2008) | 6 lines

Make sure that we release the lock on the spyee channel if the spyee or spy has hung up

(closes issue #12232)
Reported by: atis


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_chanspy.c

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

Modified: branches/1.6.0/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_chanspy.c?view=diff&rev=109027&r1=109026&r2=109027
==============================================================================
--- branches/1.6.0/apps/app_chanspy.c (original)
+++ branches/1.6.0/apps/app_chanspy.c Mon Mar 17 09:21:48 2008
@@ -275,8 +275,10 @@
 
 	/* We now hold the channel lock on spyee */
 
-	if (ast_check_hangup(chan) || ast_check_hangup(spyee))
+	if (ast_check_hangup(chan) || ast_check_hangup(spyee)) {
+		ast_channel_unlock(spyee);
 		return 0;
+	}
 
 	name = ast_strdupa(spyee->name);
 	ast_verb(2, "Spying on channel %s\n", name);