kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes deadlock caused by calling get_cid_name with chan locked.

Browse Source 
get_cid_name should not be called with a channel lock.  get_cid_name calls ast_get_hint which eventually calls pbx_find_extension.  pbx_find_extension starts and stops autoservice which should not be done with a channel lock, so get_cid_name should not be called with one.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-04-09 17:39:10 +00:00
parent 5b5bd544ba
commit 19f381b484
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_dial.c
View File

@@ -661,10 +661,11 @@ static int onedigit_goto(struct ast_channel *chan, const char *context, char ext
return 0; return 0;
} }
/* do not call with chan lock held */
static const char *get_cid_name(char *name, int namelen, struct ast_channel *chan) static const char *get_cid_name(char *name, int namelen, struct ast_channel *chan)
{ {
const char *context = S_OR(chan->macrocontext, chan->context); const char *context = ast_strdupa(S_OR(chan->macrocontext, chan->context));
const char *exten = S_OR(chan->macroexten, chan->exten); const char *exten = ast_strdupa(S_OR(chan->macroexten, chan->exten));
return ast_get_hint(NULL, 0, name, namelen, chan, context, exten) ? name : ""; return ast_get_hint(NULL, 0, name, namelen, chan, context, exten) ? name : "";
} }
@@ -1915,12 +1916,13 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
ast_free(tmp); ast_free(tmp);
continue; continue;
} else { } else {
const char *tmpexten = ast_strdupa(S_OR(chan->macroexten, chan->exten));
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); /* unlock chan here. should not call get_cid_name with chan locked */
if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) { if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) {
ast_set_callerid(tc, S_OR(chan->macroexten, chan->exten), get_cid_name(cidname, sizeof(cidname), chan), NULL); ast_set_callerid(tc, tmpexten, get_cid_name(cidname, sizeof(cidname), chan), NULL);
} }
ast_channel_unlock(chan);
ast_channel_unlock(tc); ast_channel_unlock(tc);
} }
/* Put them in the list of outgoing thingies... We're ready now. /* Put them in the list of outgoing thingies... We're ready now.