From 0c0fdebd9f49bc2b9394698e316b79cb9233e58c Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 12 Nov 2008 17:48:24 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@156171 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/app_dial.c b/apps/app_dial.c index 1adfb57903..5177a44e1e 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);