diff options
author | Mark Spencer <markster@digium.com> | 2004-06-22 14:47:21 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2004-06-22 14:47:21 +0000 |
commit | 2f4a0dc3f5743f625976e39c031adbc7002f57d0 (patch) | |
tree | 4ae9c933bdbed5f683e5126fac32e00c78d4af3a /res | |
parent | 652e085d0fe820c55823ca0cf40fd932b66b24bc (diff) |
Fix potential deadlocks in res_monitor
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rwxr-xr-x | res/res_monitor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/res_monitor.c b/res/res_monitor.c index 43b6d728e..24485a787 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; } |