diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 20:09:59 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 20:09:59 +0000 |
| commit | db3d5488a30f6a5ebcaf26f79b27b1c1bfb2b9a0 (patch) | |
| tree | 349c824044de3cb842ae159a78d4ac6b7d78dbf5 | |
| parent | f7b9c6f2a8e70a978a3167277789f7251c7ba29b (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@179905 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_directed_pickup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index 6e467ff80..d59488aa0 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -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; } |