From 091fcbce3ff1aa03433373cd7784f223a27aabac Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Fri, 20 May 2011 20:53:30 +0000 Subject: Merged revisions 320237 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r320237 | rmudgett | 2011-05-20 15:49:03 -0500 (Fri, 20 May 2011) | 27 lines 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) ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320238 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_meetme.c | 1 + 1 file changed, 1 insertion(+) (limited to 'apps') diff --git a/apps/app_meetme.c b/apps/app_meetme.c index eaca85a88..af5c2aeba 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -1371,6 +1371,7 @@ static char *complete_meetmecmd(const char *line, const char *word, int pos, int AST_LIST_UNLOCK(&confs); return usr ? ast_strdup(usrno) : NULL; } + AST_LIST_UNLOCK(&confs); } } -- cgit v1.2.3