Fix a valgrind error and potential buffer overread when handling a corrupt database.

FossilOrigin-Name: b1e0cd6444d1f710e58129723b285cf1321679fa920fc2841492dcb489ab8b9d

diff --git a/manifest b/manifest
index 3fd3923e33314bac26dba9805628107a1a11f9d1..21407ac24f13b9a61d9f9fbafdb976ca1958cd0e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schange\sto\sbtreeNext()\sto\sfacilitate\scoverage\stesting.
-D 2023-03-20T18:35:48.209
+C Fix\sa\svalgrind\serror\sand\spotential\sbuffer\soverread\swhen\shandling\sa\scorrupt\sdatabase.
+D 2023-03-21T11:13:53.102
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -710,7 +710,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c f369f3423da9c0d71f7206345e6e775aa06997b74bdb70934ed4677187a72eb8
+F src/where.c db043f9b2da776105e04b0796f42034745a8bb59433d5b7dae798a4417987e52
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
 F src/wherecode.c 9919e5a22f4b24dd96c49b8981484cbe6bbfcf466ff73ac40a06e1356aa8bf87
 F src/whereexpr.c 1dfda1695e4480c24248157df55bb4d66c732dc8d14ac16b4f076bb15de93d63
@@ -2051,8 +2051,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 1b3abc1daeac29714256b5a1d5a07a75dc986f1089054a8bee44a00583b7383a
-R 6331ee6de9d8828fe1972f245b77c00c
-U drh
-Z 11eb1b62cd83892815efd7aae8753438
+P 20b3ef04d8c79e281e32676d57c7a8569fac9e782ca24337691d44d383eff7bb
+R a3001c5c51434121b500669f922f717c
+U dan
+Z 9c6312542876d7b19be169e17e21a1f1
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8d262b41418d4694b755db4e20c8946ec096fcb6..10c02662b7c4b2adca080d0e09ade05b094cfb9e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-20b3ef04d8c79e281e32676d57c7a8569fac9e782ca24337691d44d383eff7bb
\ No newline at end of file
+b1e0cd6444d1f710e58129723b285cf1321679fa920fc2841492dcb489ab8b9d
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index f707fab12b061d51318140fcd577062cbc37164c..9de72d76de1ee682beb038fb9098d2c84c76612d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1526,6 +1526,7 @@ static int whereKeyStats(
   assert( pRec!=0 );
   assert( pIdx->nSample>0 );
   assert( pRec->nField>0 );
+ 
 
   /* Do a binary search to find the first sample greater than or equal
   ** to pRec. If pRec contains a single field, the set of samples to search
@@ -1571,7 +1572,12 @@ static int whereKeyStats(
   ** it is extended to two fields. The duplicates that this creates do not 
   ** cause any problems.
   */
-  nField = MIN(pRec->nField, pIdx->nSample);
+  if( !HasRowid(pIdx->pTable) && IsPrimaryKeyIndex(pIdx) ){
+    nField = pIdx->nKeyCol;
+  }else{
+    nField = pIdx->nColumn;
+  }
+  nField = MIN(pRec->nField, nField);
   iCol = 0;
   iSample = pIdx->nSample * nField;
   do{