Fix an assert() in fts5_index.c that might fail when dealing with corrupt records.

FossilOrigin-Name: aa55c83f35c2ab134e0842201e46e021079283f9c65595c86664060b3aa8d715

diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c
index 6ea9d9f88f3a16cdd5bed80f400e582413217318..9d80e79e56c576fbfaf76237f5100eafed6cc7ad 100644 (file)
--- a/ext/fts5/fts5_index.c
+++ b/ext/fts5/fts5_index.c
@@ -4752,7 +4752,7 @@ static int fts5IndexFindDeleteMerge(Fts5Index *p, Fts5Structure *pStruct){
         nEntry += pLvl->aSeg[iSeg].nEntry;
         nTomb += pLvl->aSeg[iSeg].nEntryTombstone;
       }
-      assert( nEntry>0 || pLvl->nSeg==0 );
+      assert_nc( nEntry>0 || pLvl->nSeg==0 );
       if( nEntry>0 ){
         int nPercent = (nTomb * 100) / nEntry;
         if( nPercent>=pConfig->nDeleteMerge && nPercent>nBest ){

diff --git a/manifest b/manifest
index bfb640eeea3432bb728d4e5ec929f93daf90c183..a5b13ffc11e7b958689062433b5477b41f4a255d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sredundant\scomparison\soperator.
-D 2023-08-01T01:07:45.466
+C Fix\san\sassert()\sin\sfts5_index.c\sthat\smight\sfail\swhen\sdealing\swith\scorrupt\srecords.
+D 2023-08-01T11:03:06.505
 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 054359543566cbff1ba65a188330660a5457299513ac71c53b3a07d934c7b081
 F ext/fts5/fts5_expr.c 2473c13542f463cae4b938c498d6193c90d38ea1a2a4f9849c0479736e50d24d
 F ext/fts5/fts5_hash.c 65e7707bc8774706574346d18c20218facf87de3599b995963c3e6d6809f203d
-F ext/fts5/fts5_index.c 9f7a24e206072b9deda2b9b6eec8d162128486d1dfad2ada92116faecc623cc8
+F ext/fts5/fts5_index.c 93b4cd116b76b6adf224cd3d213f1e06cfe10ae0eb21d6372b1c53b8f0c382a3
 F ext/fts5/fts5_main.c 2f87ee44fdb21539c264541149f07f70e065d58f37420063e5ddef80ba0f5ede
 F ext/fts5/fts5_storage.c 3c9b41fce41b6410f2e8f82eb035c6a29b2560483f773e6dc98cf3cb2e4ddbb5
 F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@@ -2049,8 +2049,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 42916af9fc0f379a608a08db894400bd735a28e26ab1ffd604d1fddfbdb3ec0c
-R 369ed1a1c6cada9c0a1698936766f3eb
-U drh
-Z cacf2fbc98de3d0e9dbbe6eaa60a2dd8
+P 018984329892c243b21adb10aa8efc7f49313ecf80477e6b61dc6365f62c489d
+R b6bc709a1f83885697109a49cbaa2f90
+U dan
+Z 735801ce1b2e44ee6011cd1fc8fe77e9
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 4f8978d1c17f55868aed3bd0bc27a4185db00130..174bc9dc9f8f6a059816a71532023bbcd4a794b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-018984329892c243b21adb10aa8efc7f49313ecf80477e6b61dc6365f62c489d
\ No newline at end of file
+aa55c83f35c2ab134e0842201e46e021079283f9c65595c86664060b3aa8d715
\ No newline at end of file