Skip to content

Commit c22eaf8

Browse files
sjlombardosjlombardo
committed
Merge sqlite-release(3.27.1) into prerelease-integration
2 parents 724b61d + 4745d8a commit c22eaf8

220 files changed

Lines changed: 21131 additions & 2752 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.in‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,7 @@ TESTSRC += \
472472
$(TOP)/ext/misc/nextchar.c \
473473
$(TOP)/ext/misc/normalize.c \
474474
$(TOP)/ext/misc/percentile.c \
475+
$(TOP)/ext/misc/prefixes.c \
475476
$(TOP)/ext/misc/regexp.c \
476477
$(TOP)/ext/misc/remember.c \
477478
$(TOP)/ext/misc/series.c \
@@ -608,7 +609,8 @@ FUZZDATA = \
608609
$(TOP)/test/fuzzdata4.db \
609610
$(TOP)/test/fuzzdata5.db \
610611
$(TOP)/test/fuzzdata6.db \
611-
$(TOP)/test/fuzzdata7.db
612+
$(TOP)/test/fuzzdata7.db \
613+
$(TOP)/test/fuzzdata8.db
612614

613615
# Standard options to testfixture
614616
#
@@ -631,6 +633,12 @@ FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
631633
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
632634
FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
633635
FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
636+
FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
637+
FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
638+
#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
639+
FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
640+
FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
641+
FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
634642
FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c
635643
DBFUZZ_OPT =
636644

@@ -689,7 +697,7 @@ ossshell$(TEXE): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.
689697
$(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS)
690698

691699
sessionfuzz$(TEXE): $(TOP)/test/sessionfuzz.c sqlite3.c sqlite3.h
692-
$(CC) $(CFLAGS) -I. -o $@ $(TOP)/test/sessionfuzz.c $(TLIBS)
700+
$(LTLINK) -o $@ $(TOP)/test/sessionfuzz.c $(TLIBS)
693701

694702
dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
695703
$(LTLINK) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(TLIBS)
@@ -702,11 +710,26 @@ DBFUZZ2_OPTS = \
702710
-DSQLITE_ENABLE_DBSTAT_VTAB \
703711
-DSQLITE_ENABLE_RTREE \
704712
-DSQLITE_ENABLE_FTS4 \
705-
-DSQLITE_EANBLE_FTS5
713+
-DSQLITE_ENABLE_FTS5
706714

707-
dbfuzz2: $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
708-
clang-6.0 -I. -g -O0 -fsanitize=fuzzer,undefined,address -o dbfuzz2 \
709-
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c
715+
dbfuzz2$(TEXE): $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
716+
$(CC) $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \
717+
-DSTANDALONE -o dbfuzz2 \
718+
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(TLIBS)
719+
mkdir -p dbfuzz2-dir
720+
cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
721+
722+
dbfuzz2-asan: $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
723+
clang-6.0 $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \
724+
-fsanitize=fuzzer,undefined,address -o dbfuzz2-asan \
725+
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(TLIBS)
726+
mkdir -p dbfuzz2-dir
727+
cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
728+
729+
dbfuzz2-msan: $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h
730+
clang-6.0 $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \
731+
-fsanitize=fuzzer,undefined,memory -o dbfuzz2-msan \
732+
$(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(TLIBS)
710733
mkdir -p dbfuzz2-dir
711734
cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir
712735

@@ -1085,6 +1108,7 @@ SHELL_SRC = \
10851108
$(TOP)/ext/expert/sqlite3expert.c \
10861109
$(TOP)/ext/expert/sqlite3expert.h \
10871110
$(TOP)/ext/misc/zipfile.c \
1111+
$(TOP)/ext/misc/memtrace.c \
10881112
$(TOP)/src/test_windirent.c
10891113

10901114
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
@@ -1222,6 +1246,7 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
12221246
TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
12231247
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
12241248
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
1249+
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
12251250

12261251
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlcipher.la
12271252
TESTFIXTURE_SRC1 = sqlite3.c
@@ -1324,6 +1349,9 @@ dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
13241349
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
13251350
$(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
13261351

1352+
dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c
1353+
$(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c
1354+
13271355
showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
13281356
$(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
13291357

@@ -1339,6 +1367,9 @@ showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
13391367
showshm$(TEXE): $(TOP)/tool/showshm.c
13401368
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
13411369

1370+
index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo
1371+
$(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS)
1372+
13421373
changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
13431374
$(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
13441375

‎Makefile.msc‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,6 +1534,7 @@ TESTEXT = \
15341534
$(TOP)\ext\misc\nextchar.c \
15351535
$(TOP)\ext\misc\normalize.c \
15361536
$(TOP)\ext\misc\percentile.c \
1537+
$(TOP)\ext\misc\prefixes.c \
15371538
$(TOP)\ext\misc\regexp.c \
15381539
$(TOP)\ext\misc\remember.c \
15391540
$(TOP)\ext\misc\series.c \
@@ -1632,7 +1633,8 @@ FUZZDATA = \
16321633
$(TOP)\test\fuzzdata4.db \
16331634
$(TOP)\test\fuzzdata5.db \
16341635
$(TOP)\test\fuzzdata6.db \
1635-
$(TOP)\test\fuzzdata7.db
1636+
$(TOP)\test\fuzzdata7.db \
1637+
$(TOP)\test\fuzzdata8.db
16361638
# <</mark>>
16371639

16381640
# Additional compiler options for the shell. These are only effective
@@ -1650,7 +1652,13 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
16501652
#
16511653
MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
16521654
FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
1653-
FUZZCHECK_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1655+
FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
1656+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DESERIALIZE
1657+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
1658+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
1659+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
1660+
FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
1661+
16541662
FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
16551663
OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
16561664
DBFUZZ_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
@@ -1737,10 +1745,10 @@ dbfuzz.exe: $(TOP)\test\dbfuzz.c $(SQLITE3C) $(SQLITE3H)
17371745
$(LTLINK) $(NO_WARN) $(DBFUZZ_COMPILE_OPTS) $(TOP)\test\dbfuzz.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
17381746

17391747
fuzzcheck.exe: $(FUZZCHECK_SRC) $(SQLITE3C) $(SQLITE3H)
1740-
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(FUZZCHECK_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1748+
$(LTLINK) $(NO_WARN) $(FUZZCHECK_OPTS) $(FUZZCHECK_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
17411749

17421750
ossshell.exe: $(OSSSHELL_SRC) $(SQLITE3C) $(SQLITE3H)
1743-
$(LTLINK) $(NO_WARN) $(FUZZCHECK_COMPILE_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
1751+
$(LTLINK) $(NO_WARN) $(FUZZCHECK_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
17441752

17451753
sessionfuzz.exe: zlib $(TOP)\test\sessionfuzz.c $(SQLITE3C) $(SQLITE3H)
17461754
$(LTLINK) $(NO_WARN) -I$(ZLIBINCDIR) $(TOP)\test\sessionfuzz.c /link $(LDFLAGS) $(LTLINKOPTS) /LIBPATH:$(ZLIBLIBDIR) $(ZLIBLIB)
@@ -2137,6 +2145,7 @@ SHELL_SRC = \
21372145
$(TOP)\ext\misc\completion.c \
21382146
$(TOP)\ext\expert\sqlite3expert.c \
21392147
$(TOP)\ext\expert\sqlite3expert.h \
2148+
$(TOP)\ext\misc\memtrace.c \
21402149
$(TOP)\src\test_windirent.c
21412150

21422151
# If use of zlib is enabled, add the "zipfile.c" source file.
@@ -2305,6 +2314,7 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
23052314
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
23062315
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
23072316
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
2317+
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
23082318
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
23092319

23102320
TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
@@ -2432,6 +2442,9 @@ testloadext.lo: $(TOP)\src\test_loadext.c $(SQLITE3H)
24322442
testloadext.dll: testloadext.lo
24332443
$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ testloadext.lo
24342444

2445+
dbtotxt.exe: $(TOP)\tool\dbtotxt.c
2446+
$(LTLINK) $(NO_WARN) $(TOP)\tool\dbtotxt.c /link $(LDFLAGS) $(LTLINKOPTS)
2447+
24352448
showdb.exe: $(TOP)\tool\showdb.c $(SQLITE3C) $(SQLITE3H)
24362449
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
24372450
$(TOP)\tool\showdb.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
@@ -2451,6 +2464,10 @@ showwal.exe: $(TOP)\tool\showwal.c $(SQLITE3C) $(SQLITE3H)
24512464
showshm.exe: $(TOP)\tool\showshm.c
24522465
$(LTLINK) $(NO_WARN) $(TOP)\tool\showshm.c /link $(LDFLAGS) $(LTLINKOPTS)
24532466

2467+
index_usage.exe: $(TOP)\tool\index_usage.c $(SQLITE3C) $(SQLITE3H)
2468+
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
2469+
$(TOP)\tool\index_usage.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
2470+
24542471
changeset.exe: $(TOP)\ext\session\changeset.c $(SQLITE3C) $(SQLITE3H)
24552472
$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
24562473
-DSQLITE_ENABLE_SESSION=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 \

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.26.0
1+
3.27.1

‎autoconf/Makefile.msc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
283283
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
284284
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
285285
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
286+
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
286287
!ENDIF
287288
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
288289
!ENDIF
@@ -937,6 +938,7 @@ LIBRESOBJS =
937938
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
938939
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
939940
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
941+
SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
940942
!ENDIF
941943

942944

‎configure‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for sqlcipher 3.26.0.
3+
# Generated by GNU Autoconf 2.69 for sqlcipher 3.27.1.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
587587
# Identity of this package.
588588
PACKAGE_NAME='sqlcipher'
589589
PACKAGE_TARNAME='sqlcipher'
590-
PACKAGE_VERSION='3.26.0'
591-
PACKAGE_STRING='sqlcipher 3.26.0'
590+
PACKAGE_VERSION='3.27.1'
591+
PACKAGE_STRING='sqlcipher 3.27.1'
592592
PACKAGE_BUGREPORT=''
593593
PACKAGE_URL=''
594594

@@ -1337,7 +1337,7 @@ if test "$ac_init_help" = "long"; then
13371337
# Omit some internal or obsolete options to make the list less imposing.
13381338
# This message is too long to be a string in the A/UX 3.1 sh.
13391339
cat <<_ACEOF
1340-
\`configure' configures sqlcipher 3.26.0 to adapt to many kinds of systems.
1340+
\`configure' configures sqlcipher 3.27.1 to adapt to many kinds of systems.
13411341
13421342
Usage: $0 [OPTION]... [VAR=VALUE]...
13431343
@@ -1402,7 +1402,7 @@ fi
14021402

14031403
if test -n "$ac_init_help"; then
14041404
case $ac_init_help in
1405-
short | recursive ) echo "Configuration of sqlcipher 3.26.0:";;
1405+
short | recursive ) echo "Configuration of sqlcipher 3.27.1:";;
14061406
esac
14071407
cat <<\_ACEOF
14081408
@@ -1538,7 +1538,7 @@ fi
15381538
test -n "$ac_init_help" && exit $ac_status
15391539
if $ac_init_version; then
15401540
cat <<\_ACEOF
1541-
sqlcipher configure 3.26.0
1541+
sqlcipher configure 3.27.1
15421542
generated by GNU Autoconf 2.69
15431543
15441544
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1957,7 +1957,7 @@ cat >config.log <<_ACEOF
19571957
This file contains any messages produced by compilers while
19581958
running configure, to aid debugging if configure makes a mistake.
19591959
1960-
It was created by sqlcipher $as_me 3.26.0, which was
1960+
It was created by sqlcipher $as_me 3.27.1, which was
19611961
generated by GNU Autoconf 2.69. Invocation command line was
19621962
19631963
$ $0 $@
@@ -13754,7 +13754,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1375413754
# report actual input values of CONFIG_FILES etc. instead of their
1375513755
# values after options handling.
1375613756
ac_log="
13757-
This file was extended by sqlcipher $as_me 3.26.0, which was
13757+
This file was extended by sqlcipher $as_me 3.27.1, which was
1375813758
generated by GNU Autoconf 2.69. Invocation command line was
1375913759
1376013760
CONFIG_FILES = $CONFIG_FILES
@@ -13820,7 +13820,7 @@ _ACEOF
1382013820
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1382113821
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1382213822
ac_cs_version="\\
13823-
sqlcipher config.status 3.26.0
13823+
sqlcipher config.status 3.27.1
1382413824
configured by $0, generated by GNU Autoconf 2.69,
1382513825
with options \\"\$ac_cs_config\\"
1382613826

‎ext/expert/expert1.test‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,8 +243,10 @@ do_setup_rec_test $tn.12.1 {
243243
CREATE INDEX t7_idx_00000062 ON t7(b);
244244
CREATE INDEX t7_idx_00000061 ON t7(a);
245245
MULTI-INDEX OR
246-
SEARCH TABLE t7 USING INDEX t7_idx_00000061 (a=?)
247-
SEARCH TABLE t7 USING INDEX t7_idx_00000062 (b=?)
246+
INDEX 1
247+
SEARCH TABLE t7 USING INDEX t7_idx_00000061 (a=?)
248+
INDEX 2
249+
SEARCH TABLE t7 USING INDEX t7_idx_00000062 (b=?)
248250
}
249251

250252
# rowid terms.

0 commit comments

Comments
 (0)