mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-06 04:30:28 +00:00
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/branches/1.8@320237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1342,6 +1342,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user