[asterisk-commits] rmudgett: branch 1.8 r320237 - in /branches/1.8: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri May 20 15:49:03 2011
New Revision: 320237

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=320237
Log:
Merged revisions 320236 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r320236 | rmudgett | 2011-05-20 15:44:54 -0500 (Fri, 20 May 2011) | 20 lines
  
  Merged revisions 320235 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r320235 | rmudgett | 2011-05-20 15:38:22 -0500 (Fri, 20 May 2011) | 13 lines
    
    The meetme CLI command completion leaves conferences mutex locked.
    
    When issuing a meetme kick CLI command and an invalid (non-existent)
    conference number is specified, pressing Tab leaves the conferences mutex
    locked and, therefore, all conferences deadlock.
    
    Add missing unlock.
    
    (closes issue #19336)
    Reported by: zvision
    Patches:
          app_meetme.diff uploaded by zvision (license 798)
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_meetme.c

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

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=320237&r1=320236&r2=320237
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Fri May 20 15:49:03 2011
@@ -1342,6 +1342,7 @@
 				AST_LIST_UNLOCK(&confs);
 				return usr ? ast_strdup(usrno) : NULL;
 			}
+			AST_LIST_UNLOCK(&confs);
 		}
 	}