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


........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@109027 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_chanspy.c

@@ -275,8 +275,10 @@ static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chansp
 
 	/* 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);