From: drh <>
Date: Sat, 25 Dec 2021 23:59:54 +0000 (+0000)
Subject: Change an assert() in FTS3 into assert_fts3_nc(), since it is a harmless
X-Git-Tag: version-3.38.0~154^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d66d5c2d353d031d4125ac80f840741a264d91c2;p=thirdparty%2Fsqlite.git

Change an assert() in FTS3 into assert_fts3_nc(), since it is a harmless
condition that can occur when processing a corrupt database file.

FossilOrigin-Name: c03205aee9015fd886b8db02c8190899cee699255ca370f939e547deaf5ba9e8
---

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 9a341a89a0..097338f547 100644
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -4486,7 +4486,7 @@ void sqlite3Fts3DoclistPrev(
 
   assert( nDoclist>0 );
   assert( *pbEof==0 );
-  assert( p || *piDocid==0 );
+  assert_fts3_nc( p || *piDocid==0 );
   assert( !p || (p>aDoclist && p<&aDoclist[nDoclist]) );
 
   if( p==0 ){
diff --git a/manifest b/manifest
index 1e06248283..0a9e781a33 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3_error_offset()\sinterface.\s\sUse\sit\sto\senhance\serror\sreporting\nin\sthe\sCLI.
-D 2021-12-25T00:26:51.340
+C Change\san\sassert()\sin\sFTS3\sinto\sassert_fts3_nc(),\ssince\sit\sis\sa\sharmless\ncondition\sthat\scan\soccur\swhen\sprocessing\sa\scorrupt\sdatabase\sfile.
+D 2021-12-25T23:59:54.620
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -84,7 +84,7 @@ F ext/fts3/README.content b9078d0843a094d86af0d48dffbff13c906702b4c3558012e67b9c
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c f27e890395640be4938b9b554cad46fdf1e42e6bd7d64154bbac27d079d00f9e
+F ext/fts3/fts3.c 6634a3854e70afa8710ee5e3a7253cd0f0c89d4cce207fcbfe2ead3bad1db7d5
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h dafdc371f9fbab175744b06cfe019d5f040cdfdbd11fea752f5dc28d45b04c05
 F ext/fts3/fts3_aux.c f0dc9bd98582615b7750218899bd0c729879b6bbf94d1be57ca1833ff49afc6f
@@ -1934,9 +1934,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 37e6e10f4364f556c7503c80408fc62895cdccdd0372fb2b63aaca02c3a1ee30 c93609a8b9dc2e656bb4360138606e269fd323469f7666dbc3bbc699e431313e
-R 8f03bf9f6f19504237d0970665f639d4
-T +closed c93609a8b9dc2e656bb4360138606e269fd323469f7666dbc3bbc699e431313e
+P 7fa20ca4c09ab0249de0363691541fa836120ec277e72feb0e1516b9bfbdd97a
+R 2b2719b5920685e35cd64747f22d50b0
 U drh
-Z 6c4e7daae6067f5d0876bbf1b0ae2412
+Z 595d1de7ae7f6fab7b1ff88e1ba1b7f2
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f50d0ac9ba..8a9e02a19f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7fa20ca4c09ab0249de0363691541fa836120ec277e72feb0e1516b9bfbdd97a
\ No newline at end of file
+c03205aee9015fd886b8db02c8190899cee699255ca370f939e547deaf5ba9e8
\ No newline at end of file