Fix another UBSAN inaccuracy in fuzzcheck.

FossilOrigin-Name: a6fb9de8f87261194e6034376f62b1cac30b764f106dd3adcf728e020f8a4fd5

diff --git a/manifest b/manifest
index a662e687e06ec02df3a7792b58e77225bb37c890..8a23a8ea69ce508f86ee8cc7aea1535f56ba6c21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Address\sminor\sinaccuracies\sin\sfuzzcheck\sand\sRTREE\sfound\sby\sUBSAN.
-D 2023-08-21T14:28:47.459
+C Fix\sanother\sUBSAN\sinaccuracy\sin\sfuzzcheck.
+D 2023-08-21T14:40:19.147
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1171,7 +1171,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c e25f6547ed2ba5f7fcf5ac1320a1a6385ae096ca768491d374b98b9ca186df03
+F test/fuzzcheck.c 69b8549e112fb815931a8c14c7955a0c407ae91a79356eecb82458384f2cb989
 F test/fuzzdata1.db 3e86d9cf5aea68ddb8e27c02d7dfdaa226347426c7eb814918e4d95475bf8517
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -2092,8 +2092,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c319033276c3565d0f1f2cae1c91791940d322fe79696bc26d74fddeb2664373
-R cef980d325e7a6296be4d376f3750694
+P a64e6c2fd8ef1d2d7f14aa9265629853298bbc480c2683c79dfd24847a61b68b
+R b650bf5b71a3c551c5070f94b1320902
 U drh
-Z cca25f989cf99093cdee0d6a34dead3a
+Z 20a4274884d659787f5bb90d5d100af8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 434f7ce1365787827c6d3786ccd53e8f9cf1104f..14bc9a84b9d67e473815587f30c88ec041ccd2b9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a64e6c2fd8ef1d2d7f14aa9265629853298bbc480c2683c79dfd24847a61b68b
\ No newline at end of file
+a6fb9de8f87261194e6034376f62b1cac30b764f106dd3adcf728e020f8a4fd5
\ No newline at end of file

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index f515d4f52a256f543a5f6400cf856297c3092606..23200a5f037ab16f4a3953e856a08873ae0e306b 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -1205,7 +1205,8 @@ int runCombinedDbSqlInput(
   iSql = decodeDatabase((unsigned char*)aData, (int)nByte, &aDb, &nDb);
   if( iSql<0 ) return 0;
   if( nDb>=75 ){
-    dbFlags = (aDb[72]<<24) + (aDb[73]<<16) + (aDb[74]<<8) + aDb[75];
+    dbFlags = ((unsigned int)aDb[72]<<24) + ((unsigned int)aDb[73]<<16) +
+              ((unsigned int)aDb[74]<<8) + (unsigned int)aDb[75];
   }
   if( nDb>=79 ){
     dbOpt = ((unsigned int)aDb[76]<<24) + ((unsigned int)aDb[77]<<16) +