diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index 0bb204ea92..cf550fa6ff 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -4838,6 +4838,10 @@ static void fts5SecureDeleteOverflow( aIdx = sqlite3Fts5MallocZero(&p->rc, (pLeaf->nn-pLeaf->szLeaf)+2); if( aIdx==0 ) break; i1 += fts5GetVarint32(&aPg[i1], iFirst); + if( iFirstrc = FTS5_CORRUPT; + break; + } i2 = sqlite3Fts5PutVarint(aIdx, iFirst-nShift); if( i1nn ){ memcpy(&aIdx[i2], &aPg[i1], pLeaf->nn-i1); diff --git a/manifest b/manifest index a45f1f64f3..e3c3bd8593 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scases\swhere\sa\srow\sis\sinserted\sinto\sa\scontentless_delete=1\sfts5\stable\sand\sthen\sdeleted\swithin\sthe\ssame\stransaction. -D 2023-07-17T18:40:39.967 +C Merge\strunk\schanges\swith\sthis\sbranch. +D 2023-07-18T13:55:55.856 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 010fabcc0aaa0dfa76b19146e8bddf7de368933eeac01e294af6607447500caa F ext/fts5/fts5_expr.c 2473c13542f463cae4b938c498d6193c90d38ea1a2a4f9849c0479736e50d24d F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982 -F ext/fts5/fts5_index.c 8e5fd1f1eb9489f1ba2eff2d3667ffd78a8d936c1180d284ccc6c37f25953a8f +F ext/fts5/fts5_index.c 109d8a75ee8a25fa19eb54073e2fc74385e79460e75ddf74a218475d20ab2c33 F ext/fts5/fts5_main.c ede405f0f11db562653b988d043a531daa66093b46c1b35b8fcddb54819cba84 F ext/fts5/fts5_storage.c 7d22c8ea1d484134bd715f55b370ae9b5a830b627986344c4ffa532c3e89186b F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae @@ -2044,8 +2044,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 cc694b83408ccb5d42204cb624145c76e95329cbe1d1fe8815c70a7a00af231a -R e5c49e6a91d60244d934bac112d65223 +P d928856a226fb7f001e55ff7e8eb58a656b982f1efa811de46c382b8b7cd778c def41225b2f10b0294ab506f28bc87873688d4030f7056839298ff18e058ece5 +R 9340fb85125cf56624b0a9d4f0a2c56f U dan -Z 153b54340cf10dbebadd96c0477be869 +Z f5189abe425e3b17c98ece46e03fa113 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6b9ee4a956..bfa7824d4a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d928856a226fb7f001e55ff7e8eb58a656b982f1efa811de46c382b8b7cd778c \ No newline at end of file +5f66eb4e2603278dcc9dbfe4bf506cba1aa03180cfb492a0dfc3a8be32cc994b \ No newline at end of file