From e2630fcd516b8f794bf342d9fd267b0c905e79ce Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Wed, 18 Dec 2013 19:28:05 +0000 Subject: 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 --- channels/chan_sip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels/chan_sip.c') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a7649127e..0fde84e2d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -8100,6 +8100,7 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit if (i->relatedpeer && i->relatedpeer->endpoint) { if (ast_endpoint_add_channel(i->relatedpeer->endpoint, tmp)) { + ast_channel_unlock(tmp); ast_channel_unref(tmp); sip_pvt_lock(i); return NULL; @@ -8113,7 +8114,6 @@ static struct ast_channel *sip_new(struct sip_pvt *i, int state, const char *tit ast_channel_callid_set(tmp, callid); } - ast_channel_lock(tmp); sip_pvt_lock(i); ast_channel_cc_params_init(tmp, i->cc_params); ast_channel_caller(tmp)->id.tag = ast_strdup(i->cid_tag); -- cgit v1.2.3