[svn-commits] mmichelson: branch 1.6.0 r131362 - in /branches/1.6.0: ./ res/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jul 16 14:57:29 2008
New Revision: 131362

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

........
r131361 | mmichelson | 2008-07-16 14:57:02 -0500 (Wed, 16 Jul 2008) | 9 lines

Don't try to dereference the dbfile pointer if
we know that it's NULL.

(closes issue #13092)
Reported by: gknispel_proformatique
Patches:
      trunk_sqlite_check_vars_null.patch uploaded by gknispel (license 261)


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/res_config_sqlite.c

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

Modified: branches/1.6.0/res/res_config_sqlite.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/res/res_config_sqlite.c?view=diff&rev=131362&r1=131361&r2=131362
==============================================================================
--- branches/1.6.0/res/res_config_sqlite.c (original)
+++ branches/1.6.0/res/res_config_sqlite.c Wed Jul 16 14:57:29 2008
@@ -600,7 +600,7 @@
 static int check_vars(void)
 {
 	if (!dbfile) {
-		ast_log(LOG_ERROR, "Undefined parameter %s\n", dbfile);
+		ast_log(LOG_ERROR, "Required parameter undefined: dbfile\n");
 		return 1;
 	}