8000 track 3.7.12.1 · githubzhaoliang/sqlcipher@35a66a5 · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit 35a66a5

Browse files
sjlombardosjlombardo
committed
track 3.7.12.1
1 parent c8c482a commit 35a66a5

17 files changed

+2210
-124
lines changed

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.12
1+
3.7.12.1

‎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.62 for sqlite 3.7.12.
3+
# Generated by GNU Autoconf 2.62 for sqlite 3.7.12.1.
44
#
55
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
66
# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
743743
# Identity of this package.
744744
PACKAGE_NAME='sqlite'
745745
PACKAGE_TARNAME='sqlite'
746-
PACKAGE_VERSION='3.7.12'
747-
PACKAGE_STRING='sqlite 3.7.12'
746+
PACKAGE_VERSION='3.7.12.1'
747+
PACKAGE_STRING='sqlite 3.7.12.1'
748748
PACKAGE_BUGREPORT=''
749749

750750
# Factoring default headers for most tests.
@@ -1485,7 +1485,7 @@ if test "$ac_init_help" = "long"; then
14851485
# Omit some internal or obsolete options to make the list less imposing.
14861486
# This message is too long to be a string in the A/UX 3.1 sh.
14871487
cat <<_ACEOF
1488-
\`configure' configures sqlite 3.7.12 to adapt to many kinds of systems.
1488+
\`configure' configures sqlite 3.7.12.1 to adapt to many kinds of systems.
14891489
14901490
Usage: $0 [OPTION]... [VAR=VALUE]...
14911491
@@ -1550,7 +1550,7 @@ fi
15501550

15511551
if test -n "$ac_init_help"; then
15521552
case $ac_init_help in
1553-
short | recursive ) echo "Configuration of sqlite 3.7.12:";;
1553+
short | recursive ) echo "Configuration of sqlite 3.7.12.1:";;
15541554
esac
15551555
cat <<\_ACEOF
15561556
@@ -1666,7 +1666,7 @@ fi
16661666
test -n "$ac_init_help" && exit $ac_status
16671667
if $ac_init_version; then
16681668
cat <<\_ACEOF
1669-
sqlite configure 3.7.12
1669+
sqlite configure 3.7.12.1
16701670
generated by GNU Autoconf 2.62
16711671
16721672
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
16801680
This file contains any messages produced by compilers while
16811681
running configure, to aid debugging if configure makes a mistake.
16821682
1683-
It was created by sqlite $as_me 3.7.12, which was
1683+
It was created by sqlite $as_me 3.7.12.1, which was
16841684
generated by GNU Autoconf 2.62. Invocation command line was
16851685
16861686
$ $0 $@
@@ -14032,7 +14032,7 @@ exec 6>&1
1403214032
# report actual input values of CONFIG_FILES etc. instead of their
1403314033
# values after options handling.
1403414034
ac_log="
14035-
This file was extended by sqlite $as_me 3.7.12, which was
14035+
This file was extended by sqlite $as_me 3.7.12.1, which was
1403614036
generated by GNU Autoconf 2.62. Invocation command line was
1403714037
1403814038
CONFIG_FILES = $CONFIG_FILES
@@ -14085,7 +14085,7 @@ Report bugs to <bug-autoconf@gnu.org>."
1408514085
_ACEOF
1408614086
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1408714087
ac_cs_version="\\
14088-
sqlite config.status 3.7.12
14088+
sqlite config.status 3.7.12.1
1408914089
configured by $0, generated by GNU Autoconf 2.62,
1409014090
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1409114091

‎manifest

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
C Version\s3.7.12
2-
D 2012-05-14T01:41:23.304
1+
C Version\s3.7.12.1
2+
D 2012-05-22T02:45:53.459
33
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
44
F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
55
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
66
F Makefile.msc 7849a871b6cdb20fd51baee6bbe5965a03326be4
77
F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
88
F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
9-
F VERSION f9313d88cb77df8617059a88eb382291321ef6bc
9+
F VERSION 1e25ebddd2ed5811c10bdabe914cd46d2dc38af8
1010
F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
1111
F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
1212
F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@ -15,7 +15,7 @@ F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
1515
F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
1616
F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
1717
F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
18-
F configure eb9e5e7f4c1601b5acf674a724e1a778481d2835 x
18+
F configure faa04198b719ec9cb2166aa0b163558e9b8ddd77 x
1919
F configure.ac 9ee886c21c095b3272137b1553ae416c8b8c8557
2020
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
2121
F doc/lemon.html 3091574143dd3415669b6745843ff8d011d33549
@@ -121,13 +121,13 @@ F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
121121
F src/btree.c df800f10896bc2ddaa1125c532d6e7a7b9efc532
122122
F src/btree.h 48a013f8964f12d944d90e4700df47b72dd6d923
123123
F src/btreeInt.h 38a639c0542c29fe8331a221c4aed0cb8686249e
124-
F src/build.c 987c6933ea170e443dc6a79d52f8d2506206b12b
124+
F src/build.c 2bb2163bb1e69f59e9f36a9413079ead42fa1d2c
125125
F src/callback.c 0cb4228cdcd827dcc5def98fb099edcc9142dbcd
126126
F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
127127
F src/ctime.c a9c26822515f81ec21588cbb482ca6724be02e33
128128
F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
129129
F src/delete.c 4c20ea4f6213b3bc1c6a510586864b679946e05e
130-
F src/expr.c eefabaa4a3dc67309a754eb0eab1a163ff4c2bf3
130+
F src/expr.c 06a7733d19dc725dc46ba51afd9feadb4b85d991
131131
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
132132
F src/fkey.c 657212460bf5cfd3ae607d12ea62092844c227b5
133133
F src/func.c c6b3c94320253a35bda43fb69cc292618e3285d6
@@ -141,7 +141,7 @@ F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
141141
F src/lempar.c 0ee69fca0be54cd93939df98d2aca4ca46f44416
142142
F src/loadext.c f20382fbaeec832438a1ba7797bee3d3c8a6d51d
143143
F src/main.c 91458c713e9b7f8dbc98d79e78f1150f0ca9c2a1
144-
F src/malloc.c 15afac5e59b6584efe072e9933aefb4230e74f97
144+
F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6
145145
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
146146
F src/mem1.c b3677415e69603d6a0e7c5410a1b3731d55beda1
147147
F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@@ -168,16 +168,16 @@ F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
168168
F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c
169169
F src/pcache1.c b30b1c35908346ecc43d8d9d17f2ddf6817f8f60
170170
F src/pragma.c e708b3bb5704605816f617e0b1d63a5488060715
171-
F src/prepare.c ec4989f7f480544bdc4192fe663470d2a2d7d61e
171+
F src/prepare.c 9a00a9612ebf80203fbb41f8a29ab8cb27a05f40
172172
F src/printf.c 7ffb4ebb8b341f67e049695ba031da717b3d2699
173173
F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
174-
F src/resolve.c 748e75299faff345f34f0e5bd02a2bac8aa69fcd
174+
F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
175175
F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
176-
F src/select.c d7b9018b7dd2e821183d69477ab55c39b8272335
177-
F src/shell.c 04399b2f9942bd02ed5ffee3b84bcdb39c52a1e6
176+
F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
177+
F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
178178
F src/sqlite.h.in 4f4d4792f6fb00387c877af013cb09d955643f12
179179
F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
180-
F src/sqliteInt.h c5e917c4f1453f3972b1fd0c81105dfe4f09cc32
180+
F src/sqliteInt.h 97ccae71ae0a4e924dcb9fab14eb4fc4839790da
181181
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
182182
F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
183183
F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -213,7 +213,7 @@ F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
213213
F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
214214
F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba
215215
F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00
216-
F src/test_quota.c 9d6be9cd3bb132df2b964193b6a4ec850f50a210
216+
F src/test_quota.c 47cb7b606160ce8f603a7d47143dd1f74de09058
217217
F src/test_quota.h ee5da2ae7f84d1c8e0e0e2ab33f01d69f10259b5
218218
F src/test_rtree.c aba603c949766c4193f1068b91c787f57274e0d9
219219
F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
@@ -242,7 +242,7 @@ F src/vdbeaux.c d52c8a424fdd4b1d5cf1ac93cc7cd20da023ec5c
242242
F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
243243
F src/vdbemem.c cb55e84b8e2c15704968ee05f0fae25883299b74
244244
F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
245-
F src/vdbetrace.c d6e50e04e1ec498150e519058f617d91b8f5c843
245+
F src/vdbetrace.c 79059ebd17b3c8545fab2a24253713e77e4ab392
246246
F src/vtab.c ae657b1c22cff43863458e768a44f915c07bc0e4
247247
F src/wal.c 7bb3ad807afc7973406c805d5157ec7a2f65e146
248248
F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
@@ -499,6 +499,7 @@ F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
499499
F test/func.test 9809b7622d721904a8cc33c1ffb87f46d506ed01
500500
F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
501501
F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
502+
F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
502503
F test/fuzz.test 77fd50afc12847af50fcf1941679d90adebadde6
503504
F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
504505
F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
@@ -690,7 +691,7 @@ F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
690691
F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
691692
F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
692693
F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
693-
F test/shell1.test cd9f846702d1d471225a988fee590a153be8192c
694+
F test/shell1.test 6e3013bc50e2b73f00d17e491f776decc82a71c8
694695
F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a
695696
F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59
696697
F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
@@ -712,7 +713,7 @@ F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
712713
F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
713714
F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
714715
F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
715-
F test/subquery.test c5e0d183f1ae6251453338a465b32ae11326e0fa
716+
F test/subquery.test d4aea23ac267463d4aa604bf937c3992347b20f7
716717
F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
717718
F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
718719
F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
@@ -997,10 +998,10 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
997998
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
998999
F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
9991000
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
1000-
P af525b5d25b5dee20528acc8321b8c6ca9aa98ae
1001-
R 25bb989b178d8b31e0e59b449786abed
1001+
P 5519cc5ef471e32a59995a34be811b46478dca1e
1002+
R f9f0e59804fa7e60869ace7ace22bd3d
10021003
T +bgcolor * #d0c0ff
10031004
T +sym-release *
1004-
T +sym-version-3.7.12 *
1005+
T +sym-version-3.7.12.1 *
10051006
U drh
1006-
Z 093fff96464341c2fff7d3363f677b3a
1007+
Z a30e57621f706278c1c64a3624297cbb

‎manifest.uuid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8654aa9540fe9fd210899d83d17f3f407096c004
1+
6d326d44fd1d626aae0e8456e5fa2049f1ce0789

‎src/build.c

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,16 +502,29 @@ static void sqliteDeleteColumnNames(sqlite3 *db, Table *pTable){
502502
** the table data structure from the hash table. But it does destroy
503503
** memory structures of the indices and foreign keys associated with
504504
** the table.
505+
**
506+
** The db parameter is optional. It is needed if the Table object
507+
** contains lookaside memory. (Table objects in the schema do not use
508+
** lookaside memory, but some ephemeral Table objects do.) Or the
509+
** db parameter can be used with db->pnBytesFreed to measure the memory
510+
** used by the Table object.
505511
*/
506512
void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
507513
Index *pIndex, *pNext;
514+
TESTONLY( int nLookaside; ) /* Used to verify lookaside not used for schema */
508515

509516
assert( !pTable || pTable->nRef>0 );
510517

511518
/* Do not delete the table until the reference count reaches zero. */
512519
if( !pTable ) return;
513520
if( ((!db || db->pnBytesFreed==0) && (--pTable->nRef)>0) ) return;
514521

522+
/* Record the number of outstanding lookaside allocations in schema Tables
523+
** prior to doing any free() operations. Since schema Tables do not use
524+
** lookaside, this number should not change. */
525+
TESTONLY( nLookaside = (db && (pTable->tabFlags & TF_Ephemeral)==0) ?
526+
db->lookaside.nOut : 0 );
527+
515528
/* Delete all indices associated with this table. */
516529
for(pIndex = pTable->pIndex; pIndex; pIndex=pNext){
517530
pNext = pIndex->pNext;
@@ -543,6 +556,9 @@ void sqlite3DeleteTable(sqlite3 *db, Table *pTable){
543556
sqlite3VtabClear(db, pTable);
544557
#endif
545558
sqlite3DbFree(db, pTable);
559+
560+
/* Verify that no lookaside memory was used by schema tables */
561+
assert( nLookaside==0 || nLookaside==db->lookaside.nOut );
546562
}
547563

548564
/*
@@ -1491,7 +1507,7 @@ void sqlite3EndTable(
14911507
sSrc.a[0].iCursor = -1;
14921508
sNC.pParse = pParse;
14931509
sNC.pSrcList = &sSrc;
1494-
sNC.isCheck = 1;
1510+
sNC.ncFlags = NC_IsCheck;
14951511
pList = p->pCheck;
14961512
for(i=0; i<pList->nExpr; i++){
14971513
if( sqlite3ResolveExprNames(&sNC, pList->a[i].pExpr) ){

‎src/expr.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3778,7 +3778,7 @@ int sqlite3ExprCompare(Expr *pA, Expr *pB){
37783778
if( !ExprHasProperty(pB, EP_IntValue) || pA->u.iValue!=pB->u.iValue ){
37793779
return 2;
37803780
}
3781-
}else if( pA->op!=TK_COLUMN && pA->op!=TK_AGG_COLUMN && pA->u.zToken ){
3781+
}else if( pA->op!=TK_COLUMN && ALWAYS(pA->op!=TK_AGG_COLUMN) && pA->u.zToken){
37823782
if( ExprHasProperty(pB, EP_IntValue) || NEVER(pB->u.zToken==0) ) return 2;
37833783
if( strcmp(pA->u.zToken,pB->u.zToken)!=0 ){
37843784
return 2;
@@ -3965,7 +3965,9 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
39653965
return WRC_Prune;
39663966
}
39673967
case TK_AGG_FUNCTION: {
3968-
if( !sqlite3FunctionUsesOtherSrc(pExpr, pSrcList) ){
3968+
if( (pNC->ncFlags & NC_InAggFunc)==0
3969+
&& !sqlite3FunctionUsesOtherSrc(pExpr, pSrcList)
3970+
){
39693971
/* Check to see if pExpr is a duplicate of another aggregate
39703972
** function that is already in the pAggInfo structure
39713973
*/
@@ -4002,8 +4004,8 @@ static int analyzeAggregate(Walker *pWalker, Expr *pExpr){
40024004
ExprSetIrreducible(pExpr);
40034005
pExpr->iAgg = (i16)i;
40044006
pExpr->pAggInfo = pAggInfo;
4005-
return WRC_Prune;
40064007
}
4008+
return WRC_Prune;
40074009
}
40084010
}
40094011
return WRC_Continue;

‎src/malloc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,10 @@ void sqlite3DbFree(sqlite3 *db, void *p){
491491
}
492492
if( isLookaside(db, p) ){
493493
LookasideSlot *pBuf = (LookasideSlot*)p;
494+
#if SQLITE_DEBUG
495+
/* Trash all content in the buffer being freed */
496+
memset(p, 0xaa, db->lookaside.sz);
497+
#endif
494498
pBuf->pNext = db->lookaside.pFree;
495499
db->lookaside.pFree = pBuf;
496500
db->lookaside.nOut--;

‎src/prepare.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,6 +706,7 @@ static int sqlite3LockAndPrepare(
706706
}
707707
sqlite3BtreeLeaveAll(db);
708708
sqlite3_mutex_leave(db->mutex);
709+
assert( rc==SQLITE_OK || *ppStmt==0 );
709710
return rc;
710711
}
711712

0 commit comments

Comments
 (0)
0