diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-29 16:28:27 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-01-29 16:28:27 +0000 |
| commit | dfc8470b92faab85bb32f1caf784eaf8c9a92c42 (patch) | |
| tree | 863ec1711fe34f3ba8102960cbb5bce77fdd71db /apps | |
| parent | f29bd485b91fd67987d17ba0a78640dbb3d2218e (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@304727 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 8ce78784d..44a4564ca 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; |