From: Joshua Colp <jcolp@digium.com>
Date: Wed, 20 May 2009 17:34:26 +0000 (+0000)
Subject: Merged revisions 195698 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6ad9680995818af933329eea3e06437fa59e894;p=thirdparty%2Fasterisk.git

Merged revisions 195698 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195698 | file | 2009-05-20 14:33:02 -0300 (Wed, 20 May 2009) | 12 lines

  Merged revisions 195688 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r195688 | file | 2009-05-20 14:30:25 -0300 (Wed, 20 May 2009) | 5 lines

    Fix some code that wrongly assumed a pointer would always be non-NULL when dealing with CDRs after a bridge.

    (closes issue #15079)
    Reported by: barryf
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@195705 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 4e9459892d..86347bb469 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2489,15 +2489,21 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 		   hears nothing but ringing while the macro does its thing. */
 		if (peer_cdr && !ast_tvzero(peer_cdr->answer)) {
 			bridge_cdr->answer = peer_cdr->answer;
-			chan_cdr->answer = peer_cdr->answer;
 			bridge_cdr->disposition = peer_cdr->disposition;
-			chan_cdr->disposition = peer_cdr->disposition;
+			if (chan_cdr) {
+				chan_cdr->answer = peer_cdr->answer;
+				chan_cdr->disposition = peer_cdr->disposition;
+			}
 		} else {
 			ast_cdr_answer(bridge_cdr);
-			ast_cdr_answer(chan_cdr); /* for the sake of cli status checks */
+			if (chan_cdr) {
+				ast_cdr_answer(chan_cdr); /* for the sake of cli status checks */
+			}
 		}
-		if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT)) {
-			ast_set_flag(chan_cdr, AST_CDR_FLAG_BRIDGED);
+		if (ast_test_flag(chan,AST_FLAG_BRIDGE_HANGUP_DONT) && (chan_cdr || peer_cdr)) {
+			if (chan_cdr) {
+				ast_set_flag(chan_cdr, AST_CDR_FLAG_BRIDGED);
+			}
 			if (peer_cdr) {
 				ast_set_flag(peer_cdr, AST_CDR_FLAG_BRIDGED);
 			}