[asterisk-commits] dvossel: branch 1.6.2 r311496 - /branches/1.6.2/apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Mar 22 10:24:45 2011
New Revision: 311496

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311496
Log:
Fixes memory leak in MeetMe AMI action

Modified:
    branches/1.6.2/apps/app_meetme.c

Modified: branches/1.6.2/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_meetme.c?view=diff&rev=311496&r1=311495&r2=311496
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Tue Mar 22 10:24:45 2011
@@ -4491,12 +4491,12 @@
 	/* 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,