diff options
| author | Terry Wilson <twilson@digium.com> | 2011-05-18 20:07:07 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2011-05-18 20:07:07 +0000 |
| commit | 2760e05dea2612ef5d19849f5996804e2a4116d1 (patch) | |
| tree | 830baadec36ba6bdceda69e2106e99e05b6b9611 /apps/app_dial.c | |
| parent | 3e25489e4c8dd99f5fef06664eafcf8689c9cdfe (diff) | |
Merged revisions 319529 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r319529 | twilson | 2011-05-18 13:05:34 -0700 (Wed, 18 May 2011) | 24 lines
Merged revisions 319528 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r319528 | twilson | 2011-05-18 13:02:06 -0700 (Wed, 18 May 2011) | 17 lines
Merged revisions 319527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r319527 | twilson | 2011-05-18 12:56:08 -0700 (Wed, 18 May 2011) | 10 lines
Fix app_dial ring groups
Revert part of r315643. We need to remove the datastore here as well.
The code in bridging code will catch anything that app_dial might miss.
(closes issue #19311)
Reported by: mspuhler
Patches:
issue_19311_no_answer.diff uploaded by elguero (license 37)
........
................
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_dial.c')
| -rw-r--r-- | apps/app_dial.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index b43674088..ae6147206 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -2395,6 +2395,17 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast peer = wait_for_answer(chan, outgoing, &to, peerflags, opt_args, &pa, &num, &result, dtmf_progress, ignore_cc, &forced_clid, &stored_clid); + /* The ast_channel_datastore_remove() function could fail here if the + * datastore was moved to another channel during a masquerade. If this is + * the case, don't free the datastore here because later, when the channel + * to which the datastore was moved hangs up, it will attempt to free this + * datastore again, causing a crash + */ + ast_channel_lock(chan); + if (!ast_channel_datastore_remove(chan, datastore)) { + ast_datastore_free(datastore); + } + ast_channel_unlock(chan); if (!peer) { if (result) { res = result; |