From 0cc143c2fff683ada16a15e19dc055852d7da27a Mon Sep 17 00:00:00 2001 From: bbryant Date: Thu, 30 Sep 2010 17:09:48 +0000 Subject: Merged revisions 289500 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r289500 | bbryant | 2010-09-30 13:08:20 -0400 (Thu, 30 Sep 2010) | 11 lines res_agi.c:handle_getvariablefull() could recursively lock a channel and not release it if an argument is the current channel's name. (closes issue #17970) Reported by: mdu113 Patches: res_agi.c.diff3 uploaded by mdu113 (license 582) Tested by: mdu113 Review: https://reviewboard.asterisk.org/r/947/ ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289501 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_agi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res') diff --git a/res/res_agi.c b/res/res_agi.c index 3ecf89be4..2fbb837b4 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1846,7 +1846,7 @@ static int handle_getvariablefull(struct ast_channel *chan, AGI *agi, int argc, if ((argc != 4) && (argc != 5)) return RESULT_SHOWUSAGE; - if (argc == 5) { + if (argc == 5 && strcasecmp(chan->name, argv[4])) { chan2 = ast_get_channel_by_name_locked(argv[4]); } else { chan2 = chan; -- cgit v1.2.3