# 
# 
# patch "ChangeLog"
#  from [8c08fec540926b5945638bfaeb6dd10212a77fda]
#    to [7b47298c3615d06fcc44573c601ddd54b3204f2f]
# 
# patch "schema_migration.cc"
#  from [d29a88209eb9605e602510c255ad7cf9f4095386]
#    to [42a196893ca385dbf05a604ae8aef0f8471fb14b]
# 
============================================================
--- ChangeLog	8c08fec540926b5945638bfaeb6dd10212a77fda
+++ ChangeLog	7b47298c3615d06fcc44573c601ddd54b3204f2f
@@ -1,3 +1,8 @@
+2006-01-07  Patrick Mauritz  <address@hidden>
+
+	* schema_migration.cc: add safe-guard against passing a null pointer
+	into string handling. (necessary with sun studio)
+
 2006-01-05  Derek Scherger  <address@hidden>
 
 	* app_state.{cc,hh} (set_restriction): remove "respect_ignore"
============================================================
--- schema_migration.cc	d29a88209eb9605e602510c255ad7cf9f4095386
+++ schema_migration.cc	42a196893ca385dbf05a604ae8aef0f8471fb14b
@@ -47,7 +47,7 @@
   L(F("executing SQL '%s'") % sql);
   int res = sqlite3_exec(db, sql, cb, data, errmsg);
   L(F("result: %i (%s)") % res % sqlite3_errmsg(db));
-  if (errmsg)
+  if (errmsg && ((*errmsg)!=0))
     L(F("errmsg: %s") % *errmsg);
   return res;
 }