[asterisk-commits] mmichelson: branch 1.6.1 r156171 - in /branches/1.6.1: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Nov 12 11:48:24 2008
New Revision: 156171

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156171
Log:
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.


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_dial.c

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

Modified: branches/1.6.1/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_dial.c?view=diff&rev=156171&r1=156170&r2=156171
==============================================================================
--- branches/1.6.1/apps/app_dial.c (original)
+++ branches/1.6.1/apps/app_dial.c Wed Nov 12 11:48:24 2008
@@ -1260,6 +1260,10 @@
 	time_t end;
 	struct ast_channel *chan = data;
 
+	if (!chan->cdr) {
+		return;
+	}
+
 	time(&end);
 
 	ast_channel_lock(chan);