kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 304727 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304727 | seanbright | 2011-01-29 11:28:27 -0500 (Sat, 29 Jan 2011) | 16 lines
  
  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/trunk@304728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2011-01-29 16:31:17 +00:00
parent c5cf436a92
commit 07b49f3adf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_meetme.c
View File

@@ -3752,9 +3752,8 @@ bailoutandtrynormal:
ast_dsp_free(dsp); ast_dsp_free(dsp);
} }
if (!user->user_no) { if (user->user_no) {
ao2_ref(user, -1); /* Only cleanup users who really joined! */
} else { /* Only cleanup users who really joined! */
now = ast_tvnow(); now = ast_tvnow();
hr = (now.tv_sec - user->jointime) / 3600; hr = (now.tv_sec - user->jointime) / 3600;
min = ((now.tv_sec - user->jointime) % 3600) / 60; min = ((now.tv_sec - user->jointime) % 3600) / 60;
@@ -3808,6 +3807,7 @@ bailoutandtrynormal:
pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid); pbx_builtin_setvar_helper(chan, "MEETMEBOOKID", conf->bookid);
} }
} }
ao2_ref(user, -1);
AST_LIST_UNLOCK(&confs); AST_LIST_UNLOCK(&confs);
return ret; return ret;