mirror of https://github.com/sqlite/sqlite
Initialize all constants at the very beginning of a prepared statement.
Do not allow constant initialization to occur once control flow has a chance to diverge, to avoid the possibility of having uninitialized registers. Ticket [80ba201079ea60807]. FossilOrigin-Name: c5c53152d68218bb5e7f922271dd7c50da2361c1
This commit is contained in:
drh
parent
eefab7512b
commit
48b5b041d1
25
manifest
25
manifest
|
|
@ -1,5 +1,8 @@
|
|||
C Have\ssqlite3_blob_bytes()\sreturn\s0\sfollowing\sa\sfailed\scall\sto\ssqlite3_reopen_blob().
|
||||
D 2010-12-06T17:11:06
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA1
|
||||
|
||||
C Initialize\sall\sconstants\sat\sthe\svery\sbeginning\sof\sa\sprepared\sstatement.\nDo\snot\sallow\sconstant\sinitialization\sto\soccur\sonce\scontrol\sflow\shas\sa\schance\nto\sdiverge,\sto\savoid\sthe\spossibility\sof\shaving\suninitialized\sregisters.\nTicket\s[80ba201079ea60807].
|
||||
D 2010-12-06T18:50:32
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
|
|
@ -128,7 +131,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
|
|||
F src/ctime.c 4f3aadad62c6c9f0d4e5a96718516ac4e3c598df
|
||||
F src/date.c 1548fdac51377e4e7833251de878b4058c148e1b
|
||||
F src/delete.c 7ed8a8c8b5f748ece92df173d7e0f7810c899ebd
|
||||
F src/expr.c 4b05c74061e9597f16bea6857b5598a8b5d5be5e
|
||||
F src/expr.c c5e0aeea657a9ac1833627ac311ab3c089dd88f9
|
||||
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
|
||||
F src/fkey.c 17950a28f28b23e8ad3feaac5fc88c324d2f600a
|
||||
F src/func.c 2b7cf54d2569c2eba42fe81165d1932b546681a3
|
||||
|
|
@ -686,6 +689,7 @@ F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
|
|||
F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84
|
||||
F test/tkt-5ee23731f.test 3581260f2a71e51db94e1506ba6b0f7311d002a9
|
||||
F test/tkt-78e04e52ea.test ab52f0c1e2de6e46c910f4cc16b086bba05952b7
|
||||
F test/tkt-80ba201079.test 29357d3008cbd9c7d031884a9e8ed609ed0b022c
|
||||
F test/tkt-80e031a00f.test 9a154173461a4dbe2de49cda73963e04842d52f7
|
||||
F test/tkt-8454a207b9.test c583a9f814a82a2b5ba95207f55001c9f0cd816c
|
||||
F test/tkt-94c04eaadb.test be5ea61cb04dfdc047d19b5c5a9e75fa3da67a7f
|
||||
|
|
@ -893,7 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
|
|||
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
|
||||
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
|
||||
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
|
||||
P 40756fe1f109da8bccac0ca28f05435792c62f81
|
||||
R 9dde255cce61a1834cdbed408450c15b
|
||||
U dan
|
||||
Z 640d6067fd568f45a0bb580334c25ddc
|
||||
P 476a8b492124d31e0656e61a6183ab55684c0bdf
|
||||
R 8559757604122a388646d1db8088502e
|
||||
U drh
|
||||
Z 3d041e2a96b40fadb27ae2c6d8beb056
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1.4.6 (GNU/Linux)
|
||||
|
||||
iD8DBQFM/TB7oxKgR168RlERAvdiAJ9Fn33s0eMo+xn0azLYTv5ssqLbpQCfW1fO
|
||||
miPMMLqlO8YnOnBLErdqUhE=
|
||||
=5ZIS
|
||||
-----END PGP SIGNATURE-----
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
476a8b492124d31e0656e61a6183ab55684c0bdf
|
||||
c5c53152d68218bb5e7f922271dd7c50da2361c1
|
||||
16
src/expr.c
16
src/expr.c
|
|
@ -1655,6 +1655,7 @@ int sqlite3CodeSubselect(
|
|||
sqlite3SelectDestInit(&dest, SRT_Set, pExpr->iTable);
|
||||
dest.affinity = (u8)affinity;
|
||||
assert( (pExpr->iTable&0x0000FFFF)==pExpr->iTable );
|
||||
pExpr->x.pSelect->iLimit = 0;
|
||||
if( sqlite3Select(pParse, pExpr->x.pSelect, &dest) ){
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1755,6 +1756,7 @@ int sqlite3CodeSubselect(
|
|||
sqlite3ExprDelete(pParse->db, pSel->pLimit);
|
||||
pSel->pLimit = sqlite3PExpr(pParse, TK_INTEGER, 0, 0,
|
||||
&sqlite3IntTokens[1]);
|
||||
pSel->iLimit = 0;
|
||||
if( sqlite3Select(pParse, pSel, &dest) ){
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -3034,6 +3036,17 @@ static int evalConstExpr(Walker *pWalker, Expr *pExpr){
|
|||
return WRC_Continue;
|
||||
}
|
||||
|
||||
/* This routine is part of the parse-tree walker for
|
||||
** sqlite3ExprCodeConstants(). Simply return WRC_Continue so that
|
||||
** tree walker logic will extend constant extraction and precoding
|
||||
** into subqueires.
|
||||
*/
|
||||
static int evalConstSelect(Walker *pNotUsed1, Select *pNotUsed2){
|
||||
UNUSED_PARAMETER(pNotUsed1);
|
||||
UNUSED_PARAMETER(pNotUsed2);
|
||||
return WRC_Continue;
|
||||
}
|
||||
|
||||
/*
|
||||
** Preevaluate constant subexpressions within pExpr and store the
|
||||
** results in registers. Modify pExpr so that the constant subexpresions
|
||||
|
|
@ -3041,8 +3054,9 @@ static int evalConstExpr(Walker *pWalker, Expr *pExpr){
|
|||
*/
|
||||
void sqlite3ExprCodeConstants(Parse *pParse, Expr *pExpr){
|
||||
Walker w;
|
||||
if( pParse->cookieGoto ) return;
|
||||
w.xExprCallback = evalConstExpr;
|
||||
w.xSelectCallback = 0;
|
||||
w.xSelectCallback = evalConstSelect;
|
||||
w.pParse = pParse;
|
||||
sqlite3WalkExpr(&w, pExpr);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,96 @@
|
|||
# 2010 December 6
|
||||
#
|
||||
# The author disclaims copyright to this source code. In place of
|
||||
# a legal notice, here is a blessing:
|
||||
#
|
||||
# May you do good and not evil.
|
||||
# May you find forgiveness for yourself and forgive others.
|
||||
# May you share freely, never taking more than you give.
|
||||
#
|
||||
#***********************************************************************
|
||||
# This file implements regression tests for SQLite library. Specifically,
|
||||
# it tests that ticket [80ba201079ea608071d22a57856b940ea3ac53ce] is
|
||||
# resolved. That ticket is about an incorrect result that appears when
|
||||
# an index is added. The root cause is that a constant is being used
|
||||
# without initialization when the OR optimization applies in the WHERE clause.
|
||||
#
|
||||
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
|
||||
do_test tkt-80ba2-100 {
|
||||
db eval {
|
||||
CREATE TABLE t1(a);
|
||||
INSERT INTO t1 VALUES('A');
|
||||
CREATE TABLE t2(b);
|
||||
INSERT INTO t2 VALUES('B');
|
||||
CREATE TABLE t3(c);
|
||||
INSERT INTO t3 VALUES('C');
|
||||
SELECT * FROM t1, t2
|
||||
WHERE (a='A' AND b='X')
|
||||
OR (a='A' AND EXISTS (SELECT * FROM t3 WHERE c='C'));
|
||||
}
|
||||
} {A B}
|
||||
do_test tkt-80ba2-101 {
|
||||
db eval {
|
||||
CREATE INDEX i1 ON t1(a);
|
||||
SELECT * FROM t1, t2
|
||||
WHERE (a='A' AND b='X')
|
||||
OR (a='A' AND EXISTS (SELECT * FROM t3 WHERE c='C'));
|
||||
}
|
||||
} {A B}
|
||||
|
||||
do_test tkt-80ba2-200 {
|
||||
db eval {
|
||||
CREATE TABLE entry_types (
|
||||
id integer primary key,
|
||||
name text
|
||||
);
|
||||
INSERT INTO "entry_types" VALUES(100,'cli_command');
|
||||
INSERT INTO "entry_types" VALUES(300,'object_change');
|
||||
CREATE TABLE object_changes (
|
||||
change_id integer primary key,
|
||||
system_id int,
|
||||
obj_id int,
|
||||
obj_context text,
|
||||
change_type int,
|
||||
command_id int
|
||||
);
|
||||
INSERT INTO "object_changes" VALUES(1551,1,114608,'exported_pools',1,2114);
|
||||
INSERT INTO "object_changes" VALUES(2048,1,114608,'exported_pools',2,2319);
|
||||
CREATE TABLE timeline (
|
||||
rowid integer primary key,
|
||||
timestamp text,
|
||||
system_id int,
|
||||
entry_type int,
|
||||
entry_id int
|
||||
);
|
||||
INSERT INTO "timeline" VALUES(6735,'2010-11-21 17:08:27.000',1,300,2048);
|
||||
INSERT INTO "timeline" VALUES(6825,'2010-11-21 17:09:21.000',1,300,2114);
|
||||
SELECT entry_type,
|
||||
entry_types.name,
|
||||
entry_id
|
||||
FROM timeline JOIN entry_types ON entry_type = entry_types.id
|
||||
WHERE (entry_types.name = 'cli_command' AND entry_id=2114)
|
||||
OR (entry_types.name = 'object_change'
|
||||
AND entry_id IN (SELECT change_id
|
||||
FROM object_changes
|
||||
WHERE obj_context = 'exported_pools'));
|
||||
}
|
||||
} {300 object_change 2048}
|
||||
do_test tkt-80ba2-201 {
|
||||
db eval {
|
||||
CREATE INDEX timeline_entry_id_idx on timeline(entry_id);
|
||||
SELECT entry_type,
|
||||
entry_types.name,
|
||||
entry_id
|
||||
FROM timeline JOIN entry_types ON entry_type = entry_types.id
|
||||
WHERE (entry_types.name = 'cli_command' AND entry_id=2114)
|
||||
OR (entry_types.name = 'object_change'
|
||||
AND entry_id IN (SELECT change_id
|
||||
FROM object_changes
|
||||
WHERE obj_context = 'exported_pools'));
|
||||
}
|
||||
} {300 object_change 2048}
|
||||
|
||||
finish_test
|
||||
Loading…
Reference in New Issue