[svn-commits] seanbright: branch 1.8 r304727 - in /branches/1.8: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sat Jan 29 10:28:27 2011
New Revision: 304727

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304727
Log:
Merged revisions 304726 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r304726 | seanbright | 2011-01-29 11:26:57 -0500 (Sat, 29 Jan 2011) | 9 lines
  
  Fix user reference leak in MeetMe.
  
  We were unlinking the user from the conferences user container, but not
  decrementing the reference count of the user as well, resulting in a leak.
  
  (closes issue #18444)
  Reported by: junky
  Tested by: seanbright
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_meetme.c

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

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=304727&r1=304726&r2=304727
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Sat Jan 29 10:28:27 2011
@@ -3700,9 +3700,8 @@
 		ast_dsp_free(dsp);
 	}
 	
-	if (!user->user_no) {
-		ao2_ref(user, -1);
-	} else { /* Only cleanup users who really joined! */
+	if (user->user_no) {
+		/* Only cleanup users who really joined! */
 		now = ast_tvnow();
 		hr = (now.tv_sec - user->jointime) / 3600;
 		min = ((now.tv_sec - user->jointime) % 3600) / 60;
@@ -3756,6 +3755,7 @@
 			pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
 		}
 	}
+	ao2_ref(user, -1);
 	AST_LIST_UNLOCK(&confs);
 
 	return ret;