]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
driver-sqlite: Don't give false out of memory errors
authorMartti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Thu, 13 Sep 2018 09:36:20 +0000 (12:36 +0300)
committerMartti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Thu, 13 Sep 2018 09:36:20 +0000 (12:36 +0300)
Only log error from sqlite3_errmsg() when connected to the db, since
otherwise dovecot logs false "out of memory" errors.

src/lib-sql/driver-sqlite.c

index 3ba030c3ccde7e0c86ca3c30ecd9068d5fc2b6f1..25cd79c0a26b4304acaaec91ce5e65fd20e2e089 100644 (file)
@@ -352,7 +352,10 @@ static const char *driver_sqlite_result_get_error(struct sql_result *_result)
        struct sqlite_result *result = (struct sqlite_result *)_result;
        struct sqlite_db *db = (struct sqlite_db *)result->api.db;
 
-       return sqlite3_errmsg(db->sqlite);
+       if (db->connected)
+               return sqlite3_errmsg(db->sqlite);
+       else
+               return "Cannot connect to database";
 }
 
 static struct sql_transaction_context *