Merged revisions 179903 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r179903 | bmd | 2009-03-03 14:02:20 -0600 (Tue, 03 Mar 2009) | 1 line

fix a leaked channel lock (and future deadlock) when we try to pick up our own channel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@179905 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-03-03 20:09:59 +00:00
parent e044bf8b4e
commit 01fc3b5542

View File

@@ -131,8 +131,8 @@ static int pickup_by_channel(struct ast_channel *chan, char *pickup)
/* Just check that we are not picking up the SAME as target */
if (chan->name != target->name && chan != target) {
res = pickup_do(chan, target);
ast_channel_unlock(target);
}
ast_channel_unlock(target);
return res;
}