mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
access channel locks through ast_channel_lock/unlock/trylock and not
through ast_mutex primitives. To detect all occurrences, I have renamed the lock field in struct ast_channel so it is clear that it shouldn't be used directly. There are some uses in res/res_features.c (see details of the diff) that are error prone as they try and lock two channels without caring about the order (or without explaining why it is safe). git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -104,11 +104,11 @@ static int softhangup_exec(struct ast_channel *chan, void *data)
|
||||
ast_log(LOG_WARNING, "Soft hanging %s up.\n", c->name);
|
||||
ast_softhangup(c, AST_SOFTHANGUP_EXPLICIT);
|
||||
if (!ast_test_flag(&flags, OPTION_ALL)) {
|
||||
ast_mutex_unlock(&c->lock);
|
||||
ast_channel_unlock(c);
|
||||
break;
|
||||
}
|
||||
}
|
||||
ast_mutex_unlock(&c->lock);
|
||||
ast_channel_unlock(c);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user