From: Sean Bright <sean@malleable.com>
Date: Sat, 29 Jan 2011 16:28:27 +0000 (+0000)
Subject: Merged revisions 304726 via svnmerge from
X-Git-Tag: 1.8.4-rc1~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05116e68f47b9155cd517dbeaec0c221acaf13fe;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@304727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8ce78784da..44a4564ca6 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -3700,9 +3700,8 @@ bailoutandtrynormal:
 		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 @@ bailoutandtrynormal:
 			pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
 		}
 	}
+	ao2_ref(user, -1);
 	AST_LIST_UNLOCK(&confs);
 
 	return ret;