diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 20:21:26 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-17 20:21:26 +0000 |
| commit | c6eec4cd8a63d1b0db721afa7e4a97db418a0812 (patch) | |
| tree | 8d240fcbff9c4e0ddc67b22899e5fc08088afcea | |
| parent | 29028888949dfc18f68dfca5e098ae91821bc00e (diff) | |
Merged revisions 189097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r189097 | mmichelson | 2009-04-17 15:20:23 -0500 (Fri, 17 Apr 2009) | 13 lines
Prevent a crash when SIP blonde transferring an unbridged call.
If one attempts to use the attended transfer button on a SIP phone
to transfer an unbridged call (such as a call to an IVR) but hangs
up while the target of the transfer is still ringing, we need to not
crash.
The problem was that ast_hangup was called from outside the channel
thread.
AST-211
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@189103 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 7a325a17c..62ab78377 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -18529,11 +18529,7 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual * append_history(transferer, "Xfer", "Refer failed"); if (targetcall_pvt->owner) ast_channel_unlock(targetcall_pvt->owner); - /* Right now, we have to hangup, sorry. Bridge is destroyed */ - if (res != -2) - ast_hangup(transferer->owner); - else - ast_clear_flag(&transferer->flags[0], SIP_DEFER_BYE_ON_TRANSFER); + ast_clear_flag(&transferer->flags[0], SIP_DEFER_BYE_ON_TRANSFER); } else { /* Transfer succeeded! */ |