From: Igor Goncharovskiy <igor.goncharovsky@gmail.com>
Date: Tue, 5 Mar 2013 03:51:48 +0000 (+0000)
Subject: Fix several unreleased mutex locks that cause problem with processing calls
X-Git-Tag: 11.4.0-rc1~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4cb37c956458e114f85134088ee22a8478d710f;p=thirdparty%2Fasterisk.git

Fix several unreleased mutex locks that cause problem with processing calls

(Closes issue ASTERISK-21119)
Reported by: Daniel Bohling
Tested by: Daniel Bohling

........

Merged revisions 382409 from http://svn.asterisk.org/svn/asterisk/branches/1.8


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@382410 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index ac4daa68da..abe6bdab1d 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -4645,6 +4645,7 @@ static struct unistimsession *channel_to_session(struct ast_channel *ast)
 	ast_mutex_lock(&sub->parent->parent->lock);
 	if (!sub->parent->parent->session) {
 		ast_log(LOG_WARNING, "Unistim callback function called without a session\n");
+		ast_mutex_unlock(&sub->parent->parent->lock);
 		return NULL;
 	}
 	ast_mutex_unlock(&sub->parent->parent->lock);
@@ -5078,6 +5079,7 @@ static int unistim_fixup(struct ast_channel *oldchan, struct ast_channel *newcha
 	if (p->owner != oldchan) {
 		ast_log(LOG_WARNING, "old channel wasn't %s (%p) but was %s (%p)\n",
 				ast_channel_name(oldchan), oldchan, ast_channel_name(p->owner), p->owner);
+		ast_mutex_unlock(&p->lock);
 		return -1;
 	}