From 249f4b902263f23e9e8f7ffc1d028203115eb036 Mon Sep 17 00:00:00 2001 From: Terry Wilson Date: Wed, 18 May 2011 20:05:34 +0000 Subject: [PATCH] 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/branches/1.8@319529 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/app_dial.c b/apps/app_dial.c index b43674088a..ae6147206d 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;