From e56f53ef7c808ab4e1425edaf6106daf0ef5cca6 Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 21 Mar 2015 10:53:01 +0000 Subject: [PATCH 1/3] Add a missing "ifcapable fts3" to a test case in vtab2.test. FossilOrigin-Name: d845b0f69093178517d66e1fc5060e8f62c681c7 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/vtab2.test | 24 +++++++++++++----------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/manifest b/manifest index 537a662c65..666fc38ffc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Correctly\sdetect\sthe\serror\sof\shaving\sa\s"*"\swildcard\son\sa\sSELECT\swithout\na\sFROM\sclause\son\sthe\sleft-hand\sside\sof\sa\srecursive\sCTE. -D 2015-03-21T03:18:22.783 +C Add\sa\smissing\s"ifcapable\sfts3"\sto\sa\stest\scase\sin\svtab2.test. +D 2015-03-21T10:53:01.184 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -1112,7 +1112,7 @@ F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661 F test/view.test f311691d696a5cc27e3c1b875cec1b0866b4ccd9 F test/vtab1.test 1cef14310144718812351a61c5cfb4ba8494a171 -F test/vtab2.test 366256bee644d034cbe078fbe1ec5bbe6b13fe42 +F test/vtab2.test 3644649aa8d1daac57fd541f6a5f914cac59203e F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e F test/vtab4.test 942f8b8280b3ea8a41dae20e7822d065ca1cb275 F test/vtab5.test 889f444970393c73f1e077e2bdc5d845e157a391 @@ -1246,7 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P d871a7921722bb0fef6d51e1110a9703ddff78c8 -R abf39ccde1b147748baa7108926922a2 -U drh -Z f5732dddfb21185ad5af5f2eb0f9450a +P b11d1793a06a44931edcbf12a615b49794d53a62 +R 55729177793663a0c48c1beb22d1dc2b +U dan +Z c52b93c6a8110abb696022d137cc00a4 diff --git a/manifest.uuid b/manifest.uuid index 3fc8b41ecb..435dcf9c12 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b11d1793a06a44931edcbf12a615b49794d53a62 \ No newline at end of file +d845b0f69093178517d66e1fc5060e8f62c681c7 \ No newline at end of file diff --git a/test/vtab2.test b/test/vtab2.test index 42b9da4670..3884ec57df 100644 --- a/test/vtab2.test +++ b/test/vtab2.test @@ -135,19 +135,21 @@ do_test vtab2-4.5 { #------------------------------------------------------------------------- # -reset_db -do_execsql_test 5.1 { - PRAGMA encoding='UTF16'; +ifcapable fts3 { + reset_db + do_execsql_test 5.1 { + PRAGMA encoding='UTF16'; + } + + do_test 5.2 { + sqlite3_exec_hex db { CREATE VIRTUAL TABLE %C8 USING fts3 } + } {0 {}} + + do_test 5.3 { + sqlite3_exec_hex db { CREATE VIRTUAL TABLE %C9 USING s } + } {/1 {malformed database schema.* already exists}/} } -do_test 5.2 { - sqlite3_exec_hex db { CREATE VIRTUAL TABLE %C8 USING fts3 } -} {0 {}} - -do_test 5.3 { - sqlite3_exec_hex db { CREATE VIRTUAL TABLE %C9 USING s } -} {/1 {malformed database schema.* already exists}/} - finish_test From 474640638da26ee9a22447a37839d333e8285bf0 Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 21 Mar 2015 12:22:16 +0000 Subject: [PATCH 2/3] Remove an unreachable branch from the OP_VCreate opcode. FossilOrigin-Name: 5fca41a3811766b48f5f23d5d49cc4e6e79fa867 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/vdbe.c | 17 +++++++++++------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index 666fc38ffc..05da0070b5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\smissing\s"ifcapable\sfts3"\sto\sa\stest\scase\sin\svtab2.test. -D 2015-03-21T10:53:01.184 +C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_VCreate\sopcode. +D 2015-03-21T12:22:16.937 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -293,7 +293,7 @@ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec -F src/vdbe.c 3d96875d883c2bf53a4806c9d4c5abff18511da4 +F src/vdbe.c bd793ed436edccaf264ec969ac92c9b5f4b41d64 F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75 @@ -1246,7 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b11d1793a06a44931edcbf12a615b49794d53a62 -R 55729177793663a0c48c1beb22d1dc2b -U dan -Z c52b93c6a8110abb696022d137cc00a4 +P d845b0f69093178517d66e1fc5060e8f62c681c7 +R 33e37ff5951445c194f8f62b65ec1d8a +U drh +Z f47a30263eba86ab7824497d08f8b218 diff --git a/manifest.uuid b/manifest.uuid index 435dcf9c12..9d0d2f5b15 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d845b0f69093178517d66e1fc5060e8f62c681c7 \ No newline at end of file +5fca41a3811766b48f5f23d5d49cc4e6e79fa867 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 8eb7721085..7d6d2b4f5d 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -6033,15 +6033,20 @@ case OP_VBegin: { */ case OP_VCreate: { Mem sMem; /* For storing the record being decoded */ + const char *zTab; /* Name of the virtual table */ + memset(&sMem, 0, sizeof(sMem)); sMem.db = db; + /* Because P2 is always a static string, it is impossible for the + ** sqlite3VdbeMemCopy() to fail */ + assert( (aMem[pOp->p2].flags & MEM_Str)!=0 ); + assert( (aMem[pOp->p2].flags & MEM_Static)!=0 ); rc = sqlite3VdbeMemCopy(&sMem, &aMem[pOp->p2]); - if( rc==SQLITE_OK ){ - const char *zTab = (const char*)sqlite3_value_text(&sMem); - assert( zTab || db->mallocFailed ); - if( zTab ){ - rc = sqlite3VtabCallCreate(db, pOp->p1, zTab, &p->zErrMsg); - } + assert( rc==SQLITE_OK ); + zTab = (const char*)sqlite3_value_text(&sMem); + assert( zTab || db->mallocFailed ); + if( zTab ){ + rc = sqlite3VtabCallCreate(db, pOp->p1, zTab, &p->zErrMsg); } sqlite3VdbeMemRelease(&sMem); break; From 998aaa03ea52f20804ce9bec5a2920ff9583877e Mon Sep 17 00:00:00 2001 From: dan Date: Sat, 21 Mar 2015 12:22:51 +0000 Subject: [PATCH 3/3] Avoid an integer overflow in fts3 causing gcc 4.7.1 with -O2 to behave counter-intuitively (perhaps because the behaviour is undefined). Add an "ifcapable trace" to a test in shell4.test. FossilOrigin-Name: e3e234649616f20610abce9ae9da1c572d3a4377 --- ext/fts3/fts3.c | 10 ++++++++-- manifest | 14 +++++++------- manifest.uuid | 2 +- test/shell4.test | 2 ++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c index 3c229403b4..3c2e5adc01 100644 --- a/ext/fts3/fts3.c +++ b/ext/fts3/fts3.c @@ -910,11 +910,16 @@ static char *fts3WriteExprList(Fts3Table *p, const char *zFunc, int *pRc){ ** This function is used when parsing the "prefix=" FTS4 parameter. */ static int fts3GobbleInt(const char **pp, int *pnOut){ + const MAX_NPREFIX = 10000000; const char *p; /* Iterator pointer */ int nInt = 0; /* Output value */ for(p=*pp; p[0]>='0' && p[0]<='9'; p++){ nInt = nInt * 10 + (p[0] - '0'); + if( nInt>MAX_NPREFIX ){ + nInt = 0; + break; + } } if( p==*pp ) return SQLITE_ERROR; *pnOut = nInt; @@ -966,9 +971,10 @@ static int fts3PrefixParameter( const char *p = zParam; int i; for(i=1; i=0 ); + if( nPrefix==0 ){ nIndex--; i--; }else{ diff --git a/manifest b/manifest index 666fc38ffc..b682535cbf 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sa\smissing\s"ifcapable\sfts3"\sto\sa\stest\scase\sin\svtab2.test. -D 2015-03-21T10:53:01.184 +C Avoid\san\sinteger\soverflow\sin\sfts3\scausing\sgcc\s4.7.1\swith\s-O2\sto\sbehave\scounter-intuitively\s(perhaps\sbecause\sthe\sbehaviour\sis\sundefined).\sAdd\san\s"ifcapable\strace"\sto\sa\stest\sin\sshell4.test. +D 2015-03-21T12:22:51.140 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d -F ext/fts3/fts3.c 022915f30538b40b584c5abb27cae47d07cb3465 +F ext/fts3/fts3.c e2c7e61d676ce7b9383d1078c9774a2f22947d57 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe F ext/fts3/fts3Int.h 394858c12a17740f7a1f6bd372c4606d4425a8d1 F ext/fts3/fts3_aux.c 5c211e17a64885faeb16b9ba7772f9d5445c2365 @@ -866,7 +866,7 @@ F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 F test/shell1.test ca88b14a8fc8b1f3543a24e519d019585ac9c903 F test/shell2.test 12b8bf901b0e3a8ac58cf5c0c63a0a388d4d1862 F test/shell3.test 5e8545ec72c4413a0e8d4c6be56496e3c257ca29 -F test/shell4.test 4cd3bd50200bf2efd6a74175d98da65aa86daf26 +F test/shell4.test ddf0a99044e2245a87fc17423e3aaa1445b3243b F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 @@ -1246,7 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P b11d1793a06a44931edcbf12a615b49794d53a62 -R 55729177793663a0c48c1beb22d1dc2b +P d845b0f69093178517d66e1fc5060e8f62c681c7 +R 7a07a789329b4f516d02a691b70e458c U dan -Z c52b93c6a8110abb696022d137cc00a4 +Z 3ae65dad7900f82b42a270fbfd21fd80 diff --git a/manifest.uuid b/manifest.uuid index 435dcf9c12..2e8412f795 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d845b0f69093178517d66e1fc5060e8f62c681c7 \ No newline at end of file +e3e234649616f20610abce9ae9da1c572d3a4377 \ No newline at end of file diff --git a/test/shell4.test b/test/shell4.test index d1466f638c..fcb0b2b715 100644 --- a/test/shell4.test +++ b/test/shell4.test @@ -122,6 +122,7 @@ do_test shell4-2.2 { do_test shell4-2.3 { catchcmd ":memory:" ".trace stdout\n.trace\n.trace off\n.dump\n" } {/^1 {PRAGMA.*Usage:.*}$/} +ifcapable trace { do_test shell4-2.4 { catchcmd ":memory:" ".trace stdout\nCREATE TABLE t1(x);SELECT * FROM t1;" } {0 {CREATE TABLE t1(x); @@ -129,6 +130,7 @@ SELECT * FROM t1;}} do_test shell4-2.5 { catchcmd ":memory:" "CREATE TABLE t1(x);\n.trace stdout\nSELECT * FROM t1;" } {0 {SELECT * FROM t1;}} +} finish_test