[svn-commits] seanbright: branch 1.6.2 r304726 - /branches/1.6.2/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sat Jan 29 10:26:57 2011
New Revision: 304726

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304726
Log:
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.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=304726&r1=304725&r2=304726
==============================================================================
--- branches/1.6.2/apps/app_meetme.c (original)
+++ branches/1.6.2/apps/app_meetme.c Sat Jan 29 10:26:57 2011
@@ -3387,9 +3387,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;
@@ -3443,6 +3442,7 @@
 			pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
 		}
 	}
+	ao2_ref(user, -1);
 	AST_LIST_UNLOCK(&confs);
 
 	return ret;