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.6.2@320236 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index c803aae34181765665c6923f5a2d3f07775c956a..500edaff458dd413b63095a1b98747625aae74d4 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -1241,6 +1241,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);
                }
        }