From: drh <drh@noemail.net>
Date: Sat, 20 Jul 2019 18:00:46 +0000 (+0000)
Subject: Early detection of a corrupt R-Tree in the R-Tree search algorithm.
X-Git-Tag: version-3.30.0~206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fc296aa662e02fc715facf50b6fb095794d7641;p=thirdparty%2Fsqlite.git

Early detection of a corrupt R-Tree in the R-Tree search algorithm.

FossilOrigin-Name: 2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 6c208b5bdc..a3dfa9b5ca 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -1595,6 +1595,12 @@ static int rtreeStepToLeaf(RtreeCursor *pCur){
       x.iLevel = p->iLevel - 1;
       if( x.iLevel ){
         x.id = readInt64(pCellData);
+        for(ii=0; ii<pCur->nPoint; ii++){
+          if( pCur->aPoint[ii].id==x.id ){
+            RTREE_IS_CORRUPT(pRtree);
+            return SQLITE_CORRUPT_VTAB;
+          }
+        }
         x.iCell = 0;
       }else{
         x.id = p->id;
diff --git a/manifest b/manifest
index 9bbee3d359..51512e1885 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimizations\sin\sthe\srtreeStepToLeaf()\sroutine\sof\sRTree.
-D 2019-07-20T17:43:28.746
+C Early\sdetection\sof\sa\scorrupt\sR-Tree\sin\sthe\sR-Tree\ssearch\salgorithm.
+D 2019-07-20T18:00:46.010
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -376,7 +376,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c c591164125808f8bba9659e92665b78412cd263e654b6f05294f3a8da7cdd9fb
-F ext/rtree/rtree.c f3ec2d1e2c0612f8141238db27cf31cf7cf580b732df7e434b05017534982a67
+F ext/rtree/rtree.c 2bc0cec6c2570d48717472d317dbbe602e296336909c011fb70eab60800325f2
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 7573134f1b4f59df36c1b0a6de51268fd3b9c714d91f3811482263e734e416ea
 F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
@@ -1837,7 +1837,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 39be3c61bd809cc89bdfdba90afc391ac9c2f81dfd8bb68a9b085b0ca8cd1fba
-R de7d7098bb99bd8f8735d10910c84616
+P 4e34e3615ff31f4a6432033797b2e1a6604007ea0e501d714ecb362632776150
+R d8a423d78b6859d967916f59be3f03d7
 U drh
-Z 8667389b078bb1f50542b3cd2f653cd6
+Z df8d1caa448f0c0227a80eae9d88cd51
diff --git a/manifest.uuid b/manifest.uuid
index 201d8a0d66..71f68e41c1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e34e3615ff31f4a6432033797b2e1a6604007ea0e501d714ecb362632776150
\ No newline at end of file
+2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
\ No newline at end of file