Further improve detection of corrupt records in fts3.

FossilOrigin-Name: a0f6d526baecd061a5e2bec5eb698fb5dfb10122ac79c853d7b3f4a48bc9f49b

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 9d580a2810e2a1a2b7e962c68b5214d996fe49a9..39a3dc35c1f53b105b2e80883c659540e5c84ec6 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -2025,7 +2025,7 @@ static int fts3SelectLeaf(
     if( rc==SQLITE_OK ){
       int iNewHeight = 0;
       fts3GetVarint32(zBlob, &iNewHeight);
-      if( iNewHeight<=iHeight ){
+      if( iNewHeight>=iHeight ){
         rc = FTS_CORRUPT_VTAB;
       }else{
         rc = fts3SelectLeaf(p, zTerm, nTerm, zBlob, nBlob, piLeaf, piLeaf2);

diff --git a/ext/fts3/fts3_write.c b/ext/fts3/fts3_write.c
index 621e0c22f517d0c7d45da4705d4a7ecb5071d7ec..7a03000a0e3990f0526b90ee29a267a49c5fa879 100644 (file)
--- a/ext/fts3/fts3_write.c
+++ b/ext/fts3/fts3_write.c
@@ -1379,7 +1379,7 @@ static int fts3SegReaderNext(
   pNext += fts3GetVarint32(pNext, &nSuffix);
   if( nSuffix<=0 
    || (&pReader->aNode[pReader->nNode] - pNext)<nSuffix
-   || nPrefix>pReader->nTermAlloc
+   || nPrefix>pReader->nTerm
   ){
     return FTS_CORRUPT_VTAB;
   }

diff --git a/manifest b/manifest
index 094142789d5e63814ed592df7e36d7689a689330..1e67be13bb3797e06e6ea8e5b6d4958f05e0e18a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sextensions\sand\stest\slogic\sso\sthat\sthe\sbuild\sworks\swith\sgcc\nand\swith\s-std=iso9899:1999
-D 2019-11-20T12:07:40.508
+C Further\simprove\sdetection\sof\scorrupt\srecords\sin\sfts3.
+D 2019-11-20T13:31:52.645
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -81,7 +81,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers b92bdeb8b46503f0dd301d364efc5ef59ef9fa8e2758b8e742f39fa93a2e422d
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c a4c64bf2d38dc54e7ad22add3b5bd1ad9fdd72ab2787a3d84f33b355fea1b98f
+F ext/fts3/fts3.c 9c2ac0443f4207e523e0b26046553b28c3e1234d867a19ac477504f37f3875be
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 7201d419716896951044f980350f0ccb376fdc15932ff1a81f0d43f5e7051a45
 F ext/fts3/fts3_aux.c 96708c8b3a7d9b8ca1b68ea2b7e503e283f20e95f145becadedfad096dbd0f34
@@ -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 4adce92958a8d6ab6a7f741e85cff9f939dbf8c63cc2182f9cebfcd8e61d69c8
+F ext/fts3/fts3_write.c 411364eec26fea45c4e24759062edb9877ff051ec5872c472f017b179f3e0920
 F ext/fts3/fts3speed.tcl b54caf6a18d38174f1a6e84219950d85e98bb1e9
 F ext/fts3/mkfts3amal.tcl 252ecb7fe6467854f2aa237bf2c390b74e71f100
 F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87fea4ac01b73
@@ -1850,7 +1850,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 a48f6e17599d7ec794cfcd60858d6a69cf05caaae9321048b111fedd86a3b5b2
-R 4365521ba36a2702d38b3f68e5e4744f
-U drh
-Z 7107861e2795dde308ab8213870561ee
+P 2575a68c3965e72f2ab211d933012442755afe6a9b7de9e9e50cdd2155fd1ec8
+R 96efbb58b9815c13b8218ef941d1efd0
+U dan
+Z 80290938c7ff45be2679507095c9fbc3

diff --git a/manifest.uuid b/manifest.uuid
index 7e8dc29c65233aaf165c24c7bd0681b9fab06fd7..99b22d0469c30b21cbaad60b3cb923229d391ff8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2575a68c3965e72f2ab211d933012442755afe6a9b7de9e9e50cdd2155fd1ec8
\ No newline at end of file
+a0f6d526baecd061a5e2bec5eb698fb5dfb10122ac79c853d7b3f4a48bc9f49b
\ No newline at end of file