kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 304683 via svnmerge from

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

................
  r304683 | seanbright | 2011-01-28 17:54:23 -0500 (Fri, 28 Jan 2011) | 16 lines
  
  Merged revisions 304659,304682 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r304659 | seanbright | 2011-01-28 16:22:09 -0500 (Fri, 28 Jan 2011) | 5 lines
    
    Don't leak references if we can't create a pseudo channel for mixing in MeetMe.
    
    If there was a problem allocating a pseudo channel when building our meetme, we
    weren't destroying our user container or destroying the mutexes that we created.
  ........
    r304682 | seanbright | 2011-01-28 17:38:05 -0500 (Fri, 28 Jan 2011) | 2 lines
    
    Revert part of the previous commit that snuck in.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2011-01-28 22:59:27 +00:00
parent 64dfc6e735
commit c5cf436a92
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/app_meetme.c
View File

@@ -1231,6 +1231,11 @@ static struct ast_conference *build_conf(const char *confno, const char *pin,
ast_log(LOG_WARNING, "Unable to open DAHDI pseudo device\n");
if (cnf->fd >= 0)
close(cnf->fd);
ao2_ref(cnf->usercontainer, -1);
ast_mutex_destroy(&cnf->playlock);
ast_mutex_destroy(&cnf->listenlock);
ast_mutex_destroy(&cnf->recordthreadlock);
ast_mutex_destroy(&cnf->announcethreadlock);
ast_free(cnf);
cnf = NULL;
goto cnfout;
@@ -1256,7 +1261,11 @@ static struct ast_conference *build_conf(const char *confno, const char *pin,
ast_hangup(cnf->chan);
else
close(cnf->fd);
ao2_ref(cnf->usercontainer, -1);
ast_mutex_destroy(&cnf->playlock);
ast_mutex_destroy(&cnf->listenlock);
ast_mutex_destroy(&cnf->recordthreadlock);
ast_mutex_destroy(&cnf->announcethreadlock);
ast_free(cnf);
cnf = NULL;
goto cnfout;