[svn-commits] russell: branch 1.6.2 r213047 - in /branches/1.6.2: ./ main/features.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Aug 19 10:35:25 2009
New Revision: 213047

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213047
Log:
Merged revisions 213046 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213046 | russell | 2009-08-19 10:32:18 -0500 (Wed, 19 Aug 2009) | 4 lines
  
  Don't blow up on a NULL cdr.
  
  Reported in #asterisk-dev.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/features.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.2/main/features.c?view=diff&rev=213047&r1=213046&r2=213047
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Wed Aug 19 10:35:25 2009
@@ -2907,7 +2907,9 @@
 				ast_channel_unlock(chan_ptr);
 			}
 			/* new channel */
-			ast_cdr_specialized_reset(new_peer_cdr,0);
+			if (new_peer_cdr) {
+				ast_cdr_specialized_reset(new_peer_cdr, 0);
+			}
 		} else {
 			ast_cdr_specialized_reset(peer_cdr,0); /* nothing changed, reset the peer_cdr  */
 		}