From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 12 Nov 2008 17:41:56 +0000 (+0000)
Subject: Merged revisions 156167 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~882
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9e84c1e5120b3626669ec64702ea700bfdfd749;p=thirdparty%2Fasterisk.git

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

........
r156167 | mmichelson | 2008-11-12 11:38:33 -0600 (Wed, 12 Nov 2008) | 7 lines

When doing some tests, I was having a crash at the end of every call
if an attended transfer occurred during the call. I traced the cause to
the CDR on one of the channels being NULL. murf suggested a check in
the end bridge callback to be sure the CDR is non-NULL before proceeding,
so that's what I'm adding.


........


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

diff --git a/apps/app_dial.c b/apps/app_dial.c
index ecf09e8688..4739e16923 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1468,6 +1468,10 @@ static void end_bridge_callback(void *data)
 	time_t end;
 	struct ast_channel *chan = data;
 
+	if (!chan->cdr) {
+		return;
+	}
+
 	time(&end);
 
 	ast_channel_lock(chan);