From: Mark Spencer <markster@digium.com>
Date: Tue, 22 Jun 2004 14:47:21 +0000 (+0000)
Subject: Fix potential deadlocks in res_monitor
X-Git-Tag: 1.0.0-rc1~186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f4a0dc3f5743f625976e39c031adbc7002f57d0;p=thirdparty%2Fasterisk.git

Fix potential deadlocks in res_monitor


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

diff --git a/res/res_monitor.c b/res/res_monitor.c
index 43b6d728e4..24485a7876 100755
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -386,6 +386,7 @@ static int start_monitor_action(struct mansession *s, struct message *m)
 	if( ast_monitor_start( c, format, fname, 1 ) ) {
 		if( ast_monitor_change_fname( c, fname, 1 ) ) {
 			astman_send_error(s, m, "Could not start monitoring channel");
+			ast_mutex_unlock(&c->lock);
 			return 0;
 		}
 	}
@@ -457,8 +458,10 @@ static int change_monitor_action(struct mansession *s, struct message *m)
 	}
 	if( ast_monitor_change_fname( c, fname, 1 ) ) {
 		astman_send_error(s, m, "Could not change monitored filename of channel");
+		ast_mutex_unlock(&c->lock);
 		return 0;
 	}
+	ast_mutex_unlock(&c->lock);
 	astman_send_ack(s, m, "Stopped monitoring channel");
 	return 0;
 }