[svn-commits] dvossel: trunk r311498 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Mar 22 10:26:51 2011
New Revision: 311498

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=311498
Log:
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
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=311498&r1=311497&r2=311498
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Tue Mar 22 10:26:51 2011
@@ -4856,12 +4856,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,