Skip to content

Commit 83d2118

Browse files
committed
Prepare release of version 2.2.7
- Update to SQLite 3.51.2
1 parent 4700a3d commit 83d2118

File tree

14 files changed

+241
-141
lines changed

14 files changed

+241
-141
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [2.2.7] - 2026-01-10
11+
12+
### Changed
13+
14+
- Based on SQLite version 3.51.2
15+
1016
## [2.2.6] - 2025-11-30
1117

1218
### Changed
@@ -692,7 +698,8 @@ The following ciphers are supported:
692698
- AES 256 Bit CBC - SHA1/SHA256/SHA512 HMAC ([SQLCipher](https://www.zetetic.net/sqlcipher/), database versions 1, 2, 3, and 4)
693699
- RC4 - No HMAC ([System.Data.SQLite](http://system.data.sqlite.org))
694700

695-
[Unreleased]: ../../compare/v2.2.6...HEAD
701+
[Unreleased]: ../../compare/v2.2.7...HEAD
702+
[2.2.7]: ../../compare/v2.2.6...v2.2.7
696703
[2.2.6]: ../../compare/v2.2.5...v2.2.6
697704
[2.2.5]: ../../compare/v2.2.4...v2.2.5
698705
[2.2.4]: ../../compare/v2.2.3...v2.2.4

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.24.0.0)
2-
project(sqlite3mc VERSION 2.2.6)
2+
project(sqlite3mc VERSION 2.2.7)
33

44
# Helper macro
55
macro(_Enable_MT _target)

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
dnl Process this script with autoconf to create configure for sqlite3mc library
22
dnl
3-
dnl Copyright (C) 2019-2025 Ulrich Telle <github@telle-online.de>
3+
dnl Copyright (C) 2019-2026 Ulrich Telle <github@telle-online.de>
44
dnl
55
dnl This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
66

7-
AC_INIT([sqlite3mc], [2.2.6], [github@telle-online.de])
7+
AC_INIT([sqlite3mc], [2.2.7], [github@telle-online.de])
88

99
dnl This is the version tested with, might work with earlier ones.
1010
AC_PREREQ([2.69])

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ The code was mainly developed under Windows, but was tested under Linux as well.
1010

1111
## Version information
1212

13-
* 2.2.6 - *November 2025*
14-
- Based on SQLite version 3.51.1
13+
* 2.2.7 - *January 2026*
14+
- Based on SQLite version 3.51.2
1515

1616
For further version information please consult the [CHANGELOG](CHANGELOG.md).
1717

src/compress.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static void compressFunc(
5959
pIn = sqlite3_value_blob(argv[0]);
6060
nIn = sqlite3_value_bytes(argv[0]);
6161
nOut = 13 + nIn + (nIn+999)/1000;
62-
pOut = sqlite3_malloc( nOut+5 );
62+
pOut = sqlite3_malloc64( nOut+5 );
6363
for(i=4; i>=0; i--){
6464
x[i] = (nIn >> (7*(4-i)))&0x7f;
6565
}
@@ -98,7 +98,7 @@ static void uncompressFunc(
9898
nOut = (nOut<<7) | (pIn[i]&0x7f);
9999
if( (pIn[i]&0x80)!=0 ){ i++; break; }
100100
}
101-
pOut = sqlite3_malloc( nOut+1 );
101+
pOut = sqlite3_malloc64( nOut+1 );
102102
rc = uncompress(pOut, &nOut, &pIn[i], nIn-i);
103103
if( rc==Z_OK ){
104104
sqlite3_result_blob(context, pOut, nOut, sqlite3_free);

src/csv.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ SQLITE_EXTENSION_INIT1
6262
# define CSV_NOINLINE
6363
#endif
6464

65+
#ifndef SQLITEINT_H
66+
typedef sqlite3_int64 i64;
67+
#endif
6568

6669
/* Max size of the error message in a CsvReader */
6770
#define CSV_MXERR 200
@@ -74,9 +77,9 @@ typedef struct CsvReader CsvReader;
7477
struct CsvReader {
7578
FILE *in; /* Read the CSV text from this input stream */
7679
char *z; /* Accumulated text for a field */
77-
int n; /* Number of bytes in z */
78-
int nAlloc; /* Space allocated for z[] */
79-
int nLine; /* Current line number */
80+
i64 n; /* Number of bytes in z */
81+
i64 nAlloc; /* Space allocated for z[] */
82+
i64 nLine; /* Current line number */
8083
int bNotFirst; /* True if prior text has been seen */
8184
int cTerm; /* Character that terminated the most recent field */
8285
size_t iIn; /* Next unread character in the input buffer */
@@ -174,7 +177,7 @@ static int csv_getc(CsvReader *p){
174177
** Return 0 on success and non-zero if there is an OOM error */
175178
static CSV_NOINLINE int csv_resize_and_append(CsvReader *p, char c){
176179
char *zNew;
177-
int nNew = p->nAlloc*2 + 100;
180+
i64 nNew = p->nAlloc*2 + 100;
178181
zNew = sqlite3_realloc64(p->z, nNew);
179182
if( zNew ){
180183
p->z = zNew;
@@ -510,7 +513,6 @@ static int csvtabConnect(
510513
# define CSV_DATA (azPValue[1])
511514
# define CSV_SCHEMA (azPValue[2])
512515

513-
514516
assert( sizeof(azPValue)==sizeof(azParam) );
515517
memset(&sRdr, 0, sizeof(sRdr));
516518
memset(azPValue, 0, sizeof(azPValue));

src/fileio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ static int fileStat(
329329
b1[sz] = 0;
330330
rc = _wstat(b1, pStatBuf);
331331
if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
332+
sqlite3_free(b1);
332333
return rc;
333334
#else
334335
return stat(zPath, pStatBuf);

src/rekeyvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
** Change 4: Call sqlite3mcBtreeSetPageSize instead of sqlite3BtreeSetPageSize for main database
2828
** (sqlite3mcBtreeSetPageSize allows to reduce the number of reserved bytes)
2929
**
30-
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.51.1 amalgamation.
30+
** This code is generated by the script rekeyvacuum.sh from SQLite version 3.51.2 amalgamation.
3131
*/
3232
SQLITE_PRIVATE SQLITE_NOINLINE int sqlite3mcRunVacuumForRekey(
3333
char **pzErrMsg, /* Write error message here */

src/shell.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7796,6 +7796,7 @@ static int fileStat(
77967796
b1[sz] = 0;
77977797
rc = _wstat(b1, pStatBuf);
77987798
if( rc==0 ) statTimesToUtc(zPath, pStatBuf);
7799+
sqlite3_free(b1);
77997800
return rc;
78007801
#else
78017802
return stat(zPath, pStatBuf);
@@ -10667,7 +10668,7 @@ static int zipfileGetEntry(
1066710668
);
1066810669
}else{
1066910670
aRead = (u8*)&aBlob[iOff + ZIPFILE_CDS_FIXED_SZ];
10670-
if( (iOff + ZIPFILE_LFH_FIXED_SZ + nFile + nExtra)>nBlob ){
10671+
if( (iOff + ZIPFILE_CDS_FIXED_SZ + nFile + nExtra)>nBlob ){
1067110672
rc = zipfileCorrupt(pzErr);
1067210673
}
1067310674
}
@@ -33622,7 +33623,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
3362233623
if( nCmd>0 ){
3362333624
sqlite3_fprintf(stderr,"Error: cannot mix regular SQL or dot-commands"
3362433625
" with \"%s\"\n", z);
33625-
return 1;
33626+
rc = 1;
33627+
goto shell_main_exit;
3362633628
}
3362733629
open_db(&data, OPEN_DB_ZIPFILE);
3362833630
if( z[2] ){

0 commit comments

Comments
 (0)