From: drh <>
Date: Thu, 16 Sep 2021 14:07:09 +0000 (+0000)
Subject: Mark an unreachable branch in rtree.
X-Git-Tag: version-3.37.0~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb56e2905360d199dc48f352cb155e3080c38a16;p=thirdparty%2Fsqlite.git

Mark an unreachable branch in rtree.

FossilOrigin-Name: e6c4afd5b365b8dea8c0742352a09029da0f9715dd2407d4ccf53f1e0a4ce625
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 9882e72988..8e1eddc1f2 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -1908,8 +1908,11 @@ static int rtreeFilter(
     }
     if( rc==SQLITE_OK ){
       RtreeSearchPoint *pNew;
+      assert( pCsr->bPoint==0 );  /* Due to the resetCursor() call above */
       pNew = rtreeSearchPointNew(pCsr, RTREE_ZERO, (u8)(pRtree->iDepth+1));
-      if( pNew==0 ) return SQLITE_NOMEM;
+      if( NEVER(pNew==0) ){       /* Because pCsr->bPoint was FALSE */
+        return SQLITE_NOMEM;
+      }
       pNew->id = 1;
       pNew->iCell = 0;
       pNew->eWithin = PARTLY_WITHIN;
diff --git a/manifest b/manifest
index cc80ea1a86..a7780cc0b2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Back\sout\sa\scouple\sof\sALWAYS()\smacros\sfrom\s[4fab9089868bbb05].\s\sTest\scase\nadded\sto\sTH3.
-D 2021-09-16T13:52:28.954
+C Mark\san\sunreachable\sbranch\sin\srtree.
+D 2021-09-16T14:07:09.331
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -393,7 +393,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 98d45533989e908bf65b43f36ff6eaad95a9ffe6f3b6b8658fbd47d45c58b10b
-F ext/rtree/rtree.c 0b29e4c22dc77624e6a34ad7bc2f4a87134c9f969181c8e810730eff3d6ecfcb
+F ext/rtree/rtree.c 0b6aa4fc1b4529c84c9d62702b28aa2b59bed87696cdec9bb83612b7fbc6ec8d
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -1923,7 +1923,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 7c82b43b7cdb825f431d3a778f8b34e32666ccb3b067f1f2533d3b3dcca7bdc9
-R bd2ea363c50ccc047d220f195374da1e
+P d26963a530ccbe36a174823d2f0bd7e06c6fca4f38ecdd04cd700c4000cc3719
+R 46d60b2ce92f695e97622b11cd163c23
 U drh
-Z 3d12fcb6b240ab06f67671311946d4f3
+Z bd29d46e35cb4f2d20bb44fb2445a352
diff --git a/manifest.uuid b/manifest.uuid
index 9f6a2edd6b..e0e0600d9b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d26963a530ccbe36a174823d2f0bd7e06c6fca4f38ecdd04cd700c4000cc3719
\ No newline at end of file
+e6c4afd5b365b8dea8c0742352a09029da0f9715dd2407d4ccf53f1e0a4ce625
\ No newline at end of file