summaryrefslogtreecommitdiff
path: root/main/message.c
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2013-12-18 19:28:05 +0000
committerJoshua Colp <jcolp@digium.com>2013-12-18 19:28:05 +0000
commite2630fcd516b8f794bf342d9fd267b0c905e79ce (patch)
treef6cd5cf70eb9af24b239d78391aed7472c09dd7f /main/message.c
parente23b8d19a49d4ee4faf3dc167ddb7ba7afe36a46 (diff)
channels: Return allocated channels locked.
This change makes ast_channel_alloc return allocated channels locked. By doing so no other thread can acquire, lock, and manipulate the channel before it is completely set up. (closes issue AST-1256) Review: https://reviewboard.asterisk.org/r/3067/ ........ Merged revisions 404204 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404210 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/message.c')
-rw-r--r--main/message.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/message.c b/main/message.c
index ef2c97f1f..7690e4a88 100644
--- a/main/message.c
+++ b/main/message.c
@@ -678,9 +678,9 @@ static struct ast_channel *create_msg_q_chan(void)
return NULL;
}
- ast_channel_unlink(chan);
-
ast_channel_tech_set(chan, &msg_chan_tech_hack);
+ ast_channel_unlock(chan);
+ ast_channel_unlink(chan);
if (!(ds = ast_datastore_alloc(&msg_datastore, NULL))) {
ast_hangup(chan);