From: Igor Goncharovskiy Date: Mon, 10 Dec 2012 05:04:36 +0000 (+0000) Subject: Fix crash on transfer initiated from insreeen menu on Unistim phones. Removed CDR... X-Git-Tag: 10.12.0-rc2~3^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd14ff04d65760869fc3be304b7209fd255cc810;p=thirdparty%2Fasterisk.git Fix crash on transfer initiated from insreeen menu on Unistim phones. Removed CDR-related code that moved to do_masquarade before. (closes issue ASTERISK-20417) Reported by: Rudolf Migalin ........ Merged revisions 377557 from http://svn.asterisk.org/svn/asterisk/branches/1.8 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@377558 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 4d9e2bbfad..177eba5558 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -1956,20 +1956,6 @@ static int attempt_transfer(struct unistim_subchannel *p1, struct unistim_subcha ast_quiet_chan(peerc); ast_quiet_chan(peerd); */ - if (peera->cdr && peerb->cdr) { - peerb->cdr = ast_cdr_append(peerb->cdr, peera->cdr); - } else if (peera->cdr) { - peerb->cdr = peera->cdr; - } - peera->cdr = NULL; - - if (peerb->cdr && peerc->cdr) { - peerb->cdr = ast_cdr_append(peerb->cdr, peerc->cdr); - } else if (peerc->cdr) { - peerb->cdr = peerc->cdr; - } - peerc->cdr = NULL; - if (ast_channel_masquerade(peerb, peerc)) { ast_log(LOG_WARNING, "Failed to masquerade %s into %s\n", peerb->name, peerc->name);