diff options
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; |