From c87a453b784bac610d055c7ad7d72705b6488c1d Mon Sep 17 00:00:00 2001 From: utelle Date: Mon, 7 Dec 2020 11:30:08 +0100 Subject: [PATCH] Fix issue #19 --- configure.ac | 2 +- readme.md | 2 ++ src/sqlite3mc_version.h | 4 ++-- src/sqlite3mc_vfs.c | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9ef8da6..404b381 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (C) 2019-2020 Ulrich Telle dnl dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package. -AC_INIT([sqlite3mc], [1.1.0], [ulrich@telle-online.de]) +AC_INIT([sqlite3mc], [1.1.1], [ulrich@telle-online.de]) dnl This is the version tested with, might work with earlier ones. AC_PREREQ([2.69]) diff --git a/readme.md b/readme.md index bfbb195..0f066e2 100644 --- a/readme.md +++ b/readme.md @@ -12,6 +12,8 @@ The code was mainly developed under Windows, but was tested under Linux as well. ## Version history +* 1.1.1 - *December 2020* + - Fixed a bug on removing encryption from an encrypted database * 1.1.0 - *December 2020* - Based on SQLite version 3.34.0 - Added code for AES hardware support on x86 platforms diff --git a/src/sqlite3mc_version.h b/src/sqlite3mc_version.h index 7f1f237..5f03910 100644 --- a/src/sqlite3mc_version.h +++ b/src/sqlite3mc_version.h @@ -14,8 +14,8 @@ #define SQLITE3MC_VERSION_MAJOR 1 #define SQLITE3MC_VERSION_MINOR 1 -#define SQLITE3MC_VERSION_RELEASE 0 +#define SQLITE3MC_VERSION_RELEASE 1 #define SQLITE3MC_VERSION_SUBRELEASE 0 -#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 1.1.0" +#define SQLITE3MC_VERSION_STRING "SQLite3 Multiple Ciphers 1.1.1" #endif /* SQLITE3MC_VERSION_H_ */ diff --git a/src/sqlite3mc_vfs.c b/src/sqlite3mc_vfs.c index 7cf93f7..c196ecc 100644 --- a/src/sqlite3mc_vfs.c +++ b/src/sqlite3mc_vfs.c @@ -252,7 +252,10 @@ SQLITE_PRIVATE void sqlite3mcSetCodec(sqlite3* db, const char* zFileName, Codec* sqlite3mcCodecFree(pDbMain->codec); } pDbMain->codec = codec; - mcReportCodecError(sqlite3mcGetBtShared(codec), SQLITE_OK); + if (codec) + { + mcReportCodecError(sqlite3mcGetBtShared(codec), SQLITE_OK); + } } else {