From: Michael Jerris <mike@jerris.com>
Date: Mon, 4 Oct 2010 20:58:29 +0000 (-0400)
Subject: fix conference deadlock on probobly inpossible buffer failure
X-Git-Tag: v1.2-rc1~291^2~18^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=757e9e20bdac33e6e368254c125d6fd12a9cbc75;p=thirdparty%2Ffreeswitch.git

fix conference deadlock on probobly inpossible buffer failure
---

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index 7018294546..b9364ff24a 100644
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -1330,6 +1330,7 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
 				switch_mutex_unlock(omember->audio_out_mutex);
 
 				if (!ok) {
+					switch_mutex_unlock(conference->mutex);
 					goto end;
 				}
 			}