]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Fix an incorrect assert() in rtree that was added recently
authordrh <>
Wed, 22 Sep 2021 13:07:10 +0000 (13:07 +0000)
committerdrh <>
Wed, 22 Sep 2021 13:07:10 +0000 (13:07 +0000)
by [f7ad73c49507c943].  Change it to testcase().

FossilOrigin-Name: 3aa0bf3a098ee9a62c79f266f94e4d290056d0f3e91237944893d6bbb686861f

ext/rtree/rtree.c
manifest
manifest.uuid

index 850755820609c78a70e36daf128eb2f4ad99258a..3dc0a6602af45533a34482ebbc26f364f732a155 100644 (file)
@@ -2751,7 +2751,7 @@ static int removeNode(Rtree *pRtree, RtreeNode *pNode, int iHeight){
     pParent = pNode->pParent;
     pNode->pParent = 0;
     rc = deleteCell(pRtree, pParent, iCell, iHeight+1);
-    assert( rc==SQLITE_OK );
+    testcase( rc!=SQLITE_OK );
   }
   rc2 = nodeRelease(pRtree, pParent);
   if( rc==SQLITE_OK ){
index 81e29ecd28c6c86e8bf4976ffeedc8cf47aac354..dc9c49a24e42f795d08caeaca0080983174b3e83 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\sTCL-based\stest\sharness\sso\sthat\sit\sis\spossible\sto\slist\smultiple\ntest\smodules\son\sthe\s"testfixture"\scommand-line\sand\shave\sthem\sall\srun.\nFor\sexample:\s"<tt>./testfixture\stest/shell*.test</tt>"
-D 2021-09-22T10:57:30.139
+C Fix\san\sincorrect\sassert()\sin\srtree\sthat\swas\sadded\srecently\nby\s[f7ad73c49507c943].\s\sChange\sit\sto\stestcase().
+D 2021-09-22T13:07:10.230
 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 fb930d5bee9deb9efbfbed72be56a0d4e4950ab216284fb5ec1c9863d32a32fa
+F ext/rtree/rtree.c e3b689c6a2622c572775f26149c4c30bc4cc9e7ddc19810cbaef7f76032b0475
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 35c3bc0def71317b7601ee0d1149e7df2cd8fc4f13ec89a64761ac3f46ca123f
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -1925,7 +1925,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 53dadf80672a4fe05341fe40873b6cfa73f6bc1e07cc41fcf10fe290c9156363
-R 5244f50bd3fe05d429a87a51b744ef41
+P 45caf9b85fc75abe80e3d2704fc634e4b103647c912c3fbffb1847d8cb581b62
+R 18c994158855b99a39b5ecbe11efbe96
 U drh
-Z 29d5ac3e2534c1f9975002934557c543
+Z fd827f5cffe8a64ecb1c57c1564b8e54
index 85157aca4abd424c92b6d7b51648d5bf32fb6500..2fd79c54301ea1d0f362a9983c4813512879895d 100644 (file)
@@ -1 +1 @@
-45caf9b85fc75abe80e3d2704fc634e4b103647c912c3fbffb1847d8cb581b62
\ No newline at end of file
+3aa0bf3a098ee9a62c79f266f94e4d290056d0f3e91237944893d6bbb686861f
\ No newline at end of file