Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Make sure tc is unlocked before calling ast_call since calling a Local

Browse Source 
channel could result in a deadlock.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Mark Michelson 17 years ago
parent 92b20aa053
commit df28954a84
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File

3
apps/app_dial.c
Unescape View File

@ -1916,6 +1916,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
else else
ast_copy_string(tc->exten, chan->exten, sizeof(tc->exten)); ast_copy_string(tc->exten, chan->exten, sizeof(tc->exten));
ast_channel_unlock(tc);
res = ast_call(tc, numsubst, 0); /* Place the call, but don't wait on the answer */ res = ast_call(tc, numsubst, 0); /* Place the call, but don't wait on the answer */
/* Save the info in cdr's that we called them */ /* Save the info in cdr's that we called them */
@ -1931,7 +1932,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
chan->hangupcause = tc->hangupcause; chan->hangupcause = tc->hangupcause;
} }
ast_channel_unlock(chan); ast_channel_unlock(chan);
ast_channel_unlock(tc);
ast_hangup(tc); ast_hangup(tc);
tc = NULL; tc = NULL;
ast_free(tmp); ast_free(tmp);
@ -1941,7 +1941,6 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
senddialevent(chan, tc, numsubst); senddialevent(chan, tc, numsubst);
ast_verb(3, "Called %s\n", numsubst); ast_verb(3, "Called %s\n", numsubst);
ast_channel_unlock(chan); ast_channel_unlock(chan);
ast_channel_unlock(tc);
if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) { if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) {
ast_set_callerid(tc, tmpexten, get_cid_name(cidname, sizeof(cidname), chan), NULL); ast_set_callerid(tc, tmpexten, get_cid_name(cidname, sizeof(cidname), chan), NULL);
} }

Write Preview
Loading…
Cancel
Save