]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fixes memory leak in MeetMe AMI action
authorDavid Vossel <dvossel@digium.com>
Tue, 22 Mar 2011 15:24:45 +0000 (15:24 +0000)
committerDavid Vossel <dvossel@digium.com>
Tue, 22 Mar 2011 15:24:45 +0000 (15:24 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@311496 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_meetme.c

index 647b3af6b9f121bb8571c1cff1e09572947b65f9..6bf0e7a938d86ce87f0914f7d9537c416624e550 100644 (file)
@@ -4491,12 +4491,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,