[svn-commits] igorg: branch 10 r377558 - in /branches/10: ./ channels/chan_unistim.c

[SVN commits to the Digium repositories]

Author: igorg
Date: Sun Dec  9 23:04:36 2012
New Revision: 377558

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377558
Log:
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

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_unistim.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_unistim.c?view=diff&rev=377558&r1=377557&r2=377558
==============================================================================
--- branches/10/channels/chan_unistim.c (original)
+++ branches/10/channels/chan_unistim.c Sun Dec  9 23:04:36 2012
@@ -1955,20 +1955,6 @@
 		   ast_quiet_chan(peerb);
 		   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,