diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-20 20:53:30 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-20 20:53:30 +0000 |
| commit | dc8ba0f195626af4e936941f4c670e318eb32177 (patch) | |
| tree | e1a3f5289087d8e624a96e15c337ba44aed0c05e | |
| parent | 3020830731b80ba4c03f7c274b802aacbc8bc6b8 (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@320238 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_meetme.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); } } |