Fix a buffer overrun in fts5 that could occur in 'secure-delete' mode when dealing...

FossilOrigin-Name: def41225b2f10b0294ab506f28bc87873688d4030f7056839298ff18e058ece5

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 7b9d21e87f00bd96e405bf81b7939109eb0cee7d..6bf3f0f8c76b483f0818b409f9819b7a70d5ac89 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4658,6 +4658,10 @@ static void fts5SecureDeleteOverflow(
         aIdx = sqlite3Fts5MallocZero(&p->rc, (pLeaf->nn-pLeaf->szLeaf)+2);
         if( aIdx==0 ) break;
         i1 += fts5GetVarint32(&aPg[i1], iFirst);
+        if( iFirst<iNext ){
+          p->rc = FTS5_CORRUPT;
+          break;
+        }
         i2 = sqlite3Fts5PutVarint(aIdx, iFirst-nShift);
         if( i1<pLeaf->nn ){
           memcpy(&aIdx[i2], &aPg[i1], pLeaf->nn-i1);

diff --git a/manifest b/manifest
index 918e28c08bd155a346ded27e213bd23864080b41..b55679b3ff8a7f9c4d9a2b8bc65fd9382c14f323 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sinternal\scleanups\sin\sthe\sOPFS\sVFS.
-D 2023-07-14T21:06:00.870
+C Fix\sa\sbuffer\soverrun\sin\sfts5\sthat\scould\soccur\sin\s'secure-delete'\smode\swhen\sdealing\swith\scorrupt\sdatabase\srecords.
+D 2023-07-18T13:55:19.822
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -92,7 +92,7 @@ F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b7292
 F ext/fts5/fts5_config.c 051056a9052f5d3a4d1c695f996fd364f920e341f136c60ab2c04aa7e267113f
 F ext/fts5/fts5_expr.c 58fb8ceddfb1cefcd54510f9f2f33c220ef9d1b3fa77462111f5ae2a825ab7b1
 F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
-F ext/fts5/fts5_index.c fe98ebd8835760b9c787d20f6b50d648a761afd8e3b55780e718ee34c694743b
+F ext/fts5/fts5_index.c ab6809cdee08c2698147e3e266378978ea75b2da3010fedc91830313f8bc587e
 F ext/fts5/fts5_main.c b4dba04a36aaf9b8e8cef0100b6dbb422cc74753eacc11d6401cac7a87c0f38d
 F ext/fts5/fts5_storage.c 76c6085239eb44424004c022e9da17a5ecd5aaec859fba90ad47d3b08f4c8082
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@@ -2043,8 +2043,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 816b503f093c4e6d92d0eb2f9fbd841acd01cc9bc89ee58d961b56c64f71406a
-R 6597235c929ad6ed0b90d6716177ff1b
-U stephan
-Z b7b5463364c5290e11704a96855173c7
+P 984d491eb3fe06f714bf07d6873321f3992a072812b46508e599bfefd39dff3e
+R b5dbc1b2e0f8c0b371198b0b049fe385
+U dan
+Z 503789c5124758a0ebc4d5ce1274a009
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d9fb0905d50052e4e8b0a0f685b8c44c81c25278..a328a9f64607ce8674b6c27f0ee37dd765936d3b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-984d491eb3fe06f714bf07d6873321f3992a072812b46508e599bfefd39dff3e
\ No newline at end of file
+def41225b2f10b0294ab506f28bc87873688d4030f7056839298ff18e058ece5
\ No newline at end of file