From: David Vossel <dvossel@digium.com>
Date: Tue, 22 Mar 2011 15:25:24 +0000 (+0000)
Subject: Merged revisions 311496 via svnmerge from
X-Git-Tag: 1.8.5-rc1~11^2~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a00e99ec56f067148e2940381433cf824f66469d;p=thirdparty%2Fasterisk.git

Merged revisions 311496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r311496 | dvossel | 2011-03-22 10:24:45 -0500 (Tue, 22 Mar 2011) | 2 lines

  Fixes memory leak in MeetMe AMI action
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@311497 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 5ddf63eeef..bb32135fc3 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -4772,12 +4772,12 @@ static int action_meetmelist(struct mansession *s, const struct message *m)
 	/* Find the right conference */
 	AST_LIST_LOCK(&confs);
 	AST_LIST_TRAVERSE(&confs, cnf, list) {
-		user_iter = ao2_iterator_init(cnf->usercontainer, 0);
 		/* If we ask for one particular, and this isn't it, skip it */
 		if (!ast_strlen_zero(conference) && strcmp(cnf->confno, conference))
 			continue;
 
 		/* Show all the users */
+		user_iter = ao2_iterator_init(cnf->usercontainer, 0);
 		while ((user = ao2_iterator_next(&user_iter))) {
 			total++;
 			astman_append(s,