[asterisk-commits] bbryant: branch 1.6.2 r289501 - in /branches/1.6.2: ./ res/res_agi.c

[SVN commits to the Asterisk project]

Author: bbryant
Date: Thu Sep 30 12:09:48 2010
New Revision: 289501

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289501
Log:
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/
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/res/res_agi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/res/res_agi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/res/res_agi.c?view=diff&rev=289501&r1=289500&r2=289501
==============================================================================
--- branches/1.6.2/res/res_agi.c (original)
+++ branches/1.6.2/res/res_agi.c Thu Sep 30 12:09:48 2010
@@ -1846,7 +1846,7 @@
 
 	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;