diff options
| author | David Vossel <dvossel@digium.com> | 2011-03-22 15:26:51 +0000 |
|---|---|---|
| committer | David Vossel <dvossel@digium.com> | 2011-03-22 15:26:51 +0000 |
| commit | 7902813301bd2e08cfa627c94ee119a5123311b6 (patch) | |
| tree | 54fc06f940790cd396598111a8efee4c8d2939bc /apps/app_meetme.c | |
| parent | 18a6c3a41508c4ca6958aa6dc4498a9450f6c8c0 (diff) | |
Merged revisions 311497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r311497 | dvossel | 2011-03-22 10:25:24 -0500 (Tue, 22 Mar 2011) | 9 lines
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/trunk@311498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_meetme.c')
| -rw-r--r-- | apps/app_meetme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index c26c8fa7f..50090dd57 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -4856,12 +4856,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, |