[asterisk-commits] tilghman: branch 1.6.1 r179362 - in /branches/1.6.1: ./ cdr/cdr_sqlite3_custom.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Mar  2 11:19:41 2009
New Revision: 179362

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=179362
Log:
Merged revisions 179361 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r179361 | tilghman | 2009-03-02 11:18:48 -0600 (Mon, 02 Mar 2009) | 2 lines
  
  Backport 1.6.0 fix to trunk (failsafe if db is not loaded)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/cdr/cdr_sqlite3_custom.c

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

Modified: branches/1.6.1/cdr/cdr_sqlite3_custom.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/cdr/cdr_sqlite3_custom.c?view=diff&rev=179362&r1=179361&r2=179362
==============================================================================
--- branches/1.6.1/cdr/cdr_sqlite3_custom.c (original)
+++ branches/1.6.1/cdr/cdr_sqlite3_custom.c Mon Mar  2 11:19:41 2009
@@ -245,6 +245,11 @@
 	char *sql = NULL;
 	struct ast_channel dummy = { 0, };
 	int count = 0;
+
+	if (db == NULL) {
+		/* Should not have loaded, but be failsafe. */
+		return 0;
+	}
 
 	{ /* Make it obvious that only sql should be used outside of this block */
 		char *escaped;