diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-09-07 15:49:31 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-09-07 15:49:31 -0500 |
| commit | 249a733c17b1bce7caf5db2d44eed5d4687a71aa (patch) | |
| tree | 76150405c63dbb3a84a5b55b8d232c4bbbcf86d4 /apps | |
| parent | 892536729188c29aecb6b2b5a6bab8928a63f530 (diff) | |
| parent | df3d0188e4f4056d669615433e5b3cafc1c56d0f (diff) | |
Merge "apps/app_dial: Fix crash on non-connect call paths for Privacy/Screening option" into 13
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index de6fe1852..7b7c70201 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -1942,8 +1942,6 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer, } return 0; /* the good exit path */ } else { - /* hang up on the callee -- he didn't want to talk anyway! */ - ast_autoservice_chan_hangup_peer(chan, peer); return -1; } } @@ -2800,6 +2798,8 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast if ( (ast_test_flag64(&opts, OPT_PRIVACY) || ast_test_flag64(&opts, OPT_SCREENING)) && pa.privdb_val == AST_PRIVACY_UNKNOWN) { if (do_privacy(chan, peer, &opts, opt_args, &pa)) { ast_channel_publish_dial(chan, peer, NULL, pa.status); + /* hang up on the callee -- he didn't want to talk anyway! */ + ast_autoservice_chan_hangup_peer(chan, peer); res = 0; goto out; } |