Skip to content
Snippets Groups Projects
Commit 2f4a0dc3 authored by Mark Spencer's avatar Mark Spencer
Browse files

Fix potential deadlocks in res_monitor

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 652e085d
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment