[asterisk-commits] seanbright: branch 1.8 r304683 - in /branches/1.8: ./ apps/app_meetme.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Fri Jan 28 16:54:23 2011
New Revision: 304683

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=304683
Log:
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.
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_meetme.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_meetme.c?view=diff&rev=304683&r1=304682&r2=304683
==============================================================================
--- branches/1.8/apps/app_meetme.c (original)
+++ branches/1.8/apps/app_meetme.c Fri Jan 28 16:54:23 2011
@@ -1220,6 +1220,11 @@
 			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;
@@ -1245,7 +1250,11 @@
 				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;