Merged revisions 156169 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r156169 | mmichelson | 2008-11-12 11:41:56 -0600 (Wed, 12 Nov 2008) | 15 lines

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: http://svn.digium.com/svn/asterisk/branches/1.6.1@156171 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 0 deletions

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 1adfb5790..5177a44e1 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1260,6 +1260,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);