diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-09 17:39:10 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-09 17:39:10 +0000 |
| commit | b7e3c49c28d44b4569cd00297fc16b7ad8f5a410 (patch) | |
| tree | ac87757004af5e5f40c2490efe29a6323310897c /apps/app_dial.c | |
| parent | 3ebc0934e1ec377b12813524546a1118814a9f0b (diff) | |
Fixes deadlock caused by calling get_cid_name with chan locked.
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: http://svn.digium.com/svn/asterisk/trunk@187426 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index ee3953fcc..f2cea75d2 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -661,10 +661,11 @@ static int onedigit_goto(struct ast_channel *chan, const char *context, char ext return 0; } +/* do not call with chan lock held */ 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 *exten = S_OR(chan->macroexten, chan->exten); + const char *context = ast_strdupa(S_OR(chan->macrocontext, chan->context)); + const char *exten = ast_strdupa(S_OR(chan->macroexten, chan->exten)); 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); continue; } else { + const char *tmpexten = ast_strdupa(S_OR(chan->macroexten, chan->exten)); senddialevent(chan, tc, 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)) { - 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); } /* Put them in the list of outgoing thingies... We're ready now. |