[asterisk-commits] mnicholson: branch 1.6.0 r213346 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Aug 20 15:36:30 2009
New Revision: 213346

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

........
  r213327 | mnicholson | 2009-08-20 15:29:32 -0500 (Thu, 20 Aug 2009) | 7 lines
  
  Fix a crash by checking the proper pointer for validity before deferencing it.
  
  (closes issue #15751)
  Reported by: atis
  Patches:
        ast_bridge_call_peer_cdr.patch uploaded by atis (license 242)
........

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

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

Modified: branches/1.6.0/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=213346&r1=213345&r2=213346
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Thu Aug 20 15:36:30 2009
@@ -2302,7 +2302,7 @@
 		   is before the bridge's start time, so I added in the 
 		   tvcmp check to the if below */
 
-		if (peer_cdr && !ast_tvzero(peer_cdr->answer) && ast_tvcmp(peer->cdr->answer, bridge_cdr->start) >= 0) {
+		if (peer_cdr && !ast_tvzero(peer_cdr->answer) && ast_tvcmp(peer_cdr->answer, bridge_cdr->start) >= 0) {
 			bridge_cdr->answer = peer_cdr->answer;
 			bridge_cdr->disposition = peer_cdr->disposition;
 			if (chan_cdr) {