From: drh <drh@noemail.net>
Date: Sun, 17 Nov 2019 00:08:24 +0000 (+0000)
Subject: Remove a reachable NEVER() in FTS3.
X-Git-Tag: version-3.31.0~314
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd6bf04bba8035836e8f92771d277a4e868c6299;p=thirdparty%2Fsqlite.git

Remove a reachable NEVER() in FTS3.

FossilOrigin-Name: 8bd75bf636f72f32d66c6c38e1918f27daf2f13290f00a001f41d50838bbda47
---

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 7d6f365b17..3b36389053 100644
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -3850,7 +3850,7 @@ static int fts3IncrmergePush(
     ** be added to.  */
     nPrefix = fts3PrefixCompress(pNode->key.a, pNode->key.n, zTerm, nTerm);
     nSuffix = nTerm - nPrefix;
-    if( NEVER(nSuffix<=0) ) return FTS_CORRUPT_VTAB;
+    if(nSuffix<=0 ) return FTS_CORRUPT_VTAB;
     nSpace  = sqlite3Fts3VarintLen(nPrefix);
     nSpace += sqlite3Fts3VarintLen(nSuffix) + nSuffix;
 
diff --git a/manifest b/manifest
index 5ac9aeea34..6c4876e2f3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\simprovements\sto\sshadow\stable\scorruption\sdetection\sin\sFTS3.
-D 2019-11-16T23:47:40.269
+C Remove\sa\sreachable\sNEVER()\sin\sFTS3.
+D 2019-11-17T00:08:24.504
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -99,7 +99,7 @@ F ext/fts3/fts3_tokenizer.h 64c6ef6c5272c51ebe60fc607a896e84288fcbc3
 F ext/fts3/fts3_tokenizer1.c 5c98225a53705e5ee34824087478cf477bdb7004
 F ext/fts3/fts3_unicode.c 4b9af6151c29b35ed09574937083cece7c31e911f69615e168a39677569b684d
 F ext/fts3/fts3_unicode2.c 416eb7e1e81142703520d284b768ca2751d40e31fa912cae24ba74860532bf0f
-F ext/fts3/fts3_write.c 84f7b1390b85e6630d46fc1162f6138ce08aabcf9d57289db8fa1e04602cd3e9
+F ext/fts3/fts3_write.c f31351fc0405852d6ed32aa272e7770e55dffa33fc1d4c028aadef50a84213ab
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73
@@ -1016,7 +1016,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db e7a86fd83dda151d160445d542e32e5c6019c541b3a74c2a525b6ac640639711
-F test/fuzzdata8.db 1490d840640e5ace4ec8e10e252681497fd7d5ffbb6b783bd3899fa789698226
+F test/fuzzdata8.db b45368bbe9f86d40d30603e8f780ac29807cbcc951a18d7a7fd9d0c0e904706e
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
@@ -1849,7 +1849,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 04b2873be5aedeb1c4325cf36c4b5d180f929a641caf1e3829c03778adb29c8e
-R c4135a72f080b6416943cb56e5f0bed9
+P 51525f9c3235967bc00a090e84c70a6400698c897aa4742e817121c725b8c99d
+R 53c3e5a5ab84e0cd96e357e129ba281f
 U drh
-Z 628c9e8e0d5353ed3a948a9f5a3cad9a
+Z 4e9166f4f5d94dbdb240d614319c425c
diff --git a/manifest.uuid b/manifest.uuid
index 40ad128337..45e95d56cc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-51525f9c3235967bc00a090e84c70a6400698c897aa4742e817121c725b8c99d
\ No newline at end of file
+8bd75bf636f72f32d66c6c38e1918f27daf2f13290f00a001f41d50838bbda47
\ No newline at end of file
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index 7b4a3d3854..820ff08a28 100644
Binary files a/test/fuzzdata8.db and b/test/fuzzdata8.db differ