From ff2c6a4db0bb1a94b9595403f39d34545bb9bb2d Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Mon, 14 Sep 2009 15:17:50 +0000 Subject: [PATCH] Merged revisions 218224 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r218224 | mnicholson | 2009-09-14 09:57:23 -0500 (Mon, 14 Sep 2009) | 14 lines Merged revisions 218223 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines Ensure we don't pickup ourselves when doing pickup by exten. (closes issue #15100) Reported by: lmsteffan Patches: (modified) pickup.patch uploaded by lmsteffan (license 779) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@218227 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_directed_pickup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c index d59488aa01..0f6eb0a907 100644 --- a/apps/app_directed_pickup.c +++ b/apps/app_directed_pickup.c @@ -146,7 +146,7 @@ static int pickup_by_exten(struct ast_channel *chan, const char *exten, const ch while ((target = ast_channel_walk_locked(target))) { if ((!strcasecmp(target->macroexten, exten) || !strcasecmp(target->exten, exten)) && !strcasecmp(target->dialcontext, context) && - can_pickup(target)) { + (chan != target) && can_pickup(target)) { res = pickup_do(chan, target); ast_channel_unlock(target); break; -- 2.47.2