The check-in [b7810062ec2489e1] was not quite right in that it allowed an

oversized shift operation (which is UB in C) on some obscure inputs.  OSSFuzz
found the problem for us overnight.

FossilOrigin-Name: 62f2235adf796c72882b26313489cf49804ec3ec4972e0eee5034176cbb07f84

diff --git a/manifest b/manifest
index aa5799c997589cc69d1c367e13c4de6565617411..bf3d8d51642e6a55f3ffedac1b0c2e11598a230d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\senhancements\sto\sRTREE,\sfollowing\sup\sto\scheck-in\s[f898d04cf272ef01]\nso\sthat\sconstraints\sare\sallowed\sto\sbe\scompared\sto\sstrings\sthat\slook\slike\nnumbers.\s\sTicket\s[aa573a787b8f1fdf]
-D 2019-12-06T01:38:24.618
+C The\scheck-in\s[b7810062ec2489e1]\swas\snot\squite\sright\sin\sthat\sit\sallowed\san\noversized\sshift\soperation\s(which\sis\sUB\sin\sC)\son\ssome\sobscure\sinputs.\s\sOSSFuzz\nfound\sthe\sproblem\sfor\sus\sovernight.
+D 2019-12-06T11:48:27.693
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -613,7 +613,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 15a2845769f51ba132f9cf0b2c7a6887a91fc8437892dbcce9fcdc68b66d60a1
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
-F src/where.c b9f5acc55894d220df569ba169c2ae492fd3cb853580dc61bbaaff35971a4f22
+F src/where.c bb2d3c08de9ae57f6ff17459cefd9e38e82d3e7aaa544bc49503b6fdaaf2c800
 F src/whereInt.h 4a296fd4fa79fdcbc2b5e8c1b898901617655811223e1082b899c23ecb092217
 F src/wherecode.c 909325b98d5cb313f24e5c8cb304a3e3c73ca6631cdb19cfa1f580dde182fedb
 F src/whereexpr.c 39b6a538804c6e1248c22b33e09d00f89ae6a099c849c4d841ce3995562287b4
@@ -1852,7 +1852,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ebf897e861c19e214c57f1e73841b505182202cc8d7d39e24d5a1e5625e26b4a
-R 0a09f01094f6dfbffde0be2b93b69759
+P 32772dfd50b602c049d8c30bc28cde60a18b7495a997d728081f689ff417c956
+R 1c03acd087c3699b97e3d620797db9c3
 U drh
-Z ab76657f541308941fa3ae62cffd947d
+Z ab13954c7c4fd96013e313a189fb6632

diff --git a/manifest.uuid b/manifest.uuid
index dcc30298dd5ec4cb35e37467c7aec2297bbc96ed..a763b50303601f615396ed9eeb0ea1ba1432009b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32772dfd50b602c049d8c30bc28cde60a18b7495a997d728081f689ff417c956
\ No newline at end of file
+62f2235adf796c72882b26313489cf49804ec3ec4972e0eee5034176cbb07f84
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 6100fd62c9a0c0745414f4ff5ba3c542894daf4b..347598abc831ab4a4785cffe925c7d85b30df932 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3203,8 +3203,8 @@ static int whereLoopAddVirtualOne(
       if( iTerm>mxTerm ) mxTerm = iTerm;
       testcase( iTerm==15 );
       testcase( iTerm==16 );
-      if( iTerm<16 && pUsage[i].omit ){
-        if( ((1<<i)&mNoOmit)==0 ){
+      if( pUsage[i].omit ){
+        if( i<16 && ((1<<i)&mNoOmit)==0 ){
           testcase( i!=iTerm );
           pNew->u.vtab.omitMask |= 1<<iTerm;
         }else{