Skip to content

Commit bf64cbd

Browse files
author
drh
committed
Remove an ALWAYS() from RTREE. Dbsqlfuzz found a way to make it false.
FossilOrigin-Name: 40f0a29e6dd90fcb969d7c0e49728ba0ee8f31d9e8f502b9a21469620a8ad283
1 parent cd6ea30 commit bf64cbd

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

ext/rtree/rtree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2730,7 +2730,7 @@ static int removeNode(Rtree *pRtree, RtreeNode *pNode, int iHeight){
27302730

27312731
/* Remove the entry in the parent cell. */
27322732
rc = nodeParentIndex(pRtree, pNode, &iCell);
2733-
if( ALWAYS(rc==SQLITE_OK) ){
2733+
if( rc==SQLITE_OK ){
27342734
pParent = pNode->pParent;
27352735
pNode->pParent = 0;
27362736
rc = deleteCell(pRtree, pParent, iCell, iHeight+1);

manifest

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
C Updates\sto\sRTREE\sto\sfacility\stesting.
2-
D 2024-01-07T00:45:53.145
1+
C Remove\san\sALWAYS()\sfrom\sRTREE.\s\sDbsqlfuzz\sfound\sa\sway\sto\smake\sit\sfalse.
2+
D 2024-01-07T20:27:54.639
33
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
44
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
55
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -495,7 +495,7 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
495495
F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
496496
F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
497497
F ext/rtree/geopoly.c 0dd4775e896cee6067979d67aff7c998e75c2c9d9cd8d62a1a790c09cde7adca
498-
F ext/rtree/rtree.c a8305eed6d9c24425e8db33c9a5b0742de68125af876d59dda1878496aabbf6e
498+
F ext/rtree/rtree.c d0134bb75bc92b18a1dc011ec10419642f055c67af8ff44fc4a07c5fa9f189cb
499499
F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
500500
F ext/rtree/rtree1.test 2b5b8c719c6a4abe377f57766f428a49af36a93061cb146cccfdc3b30000c0a4
501501
F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -2156,8 +2156,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
21562156
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
21572157
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
21582158
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
2159-
P b115b4f75bc7c4e6d9bab5edf13297f27a36f30083c80d2c502b01208da5dfc0
2160-
R c7c920ea2735b30b51b5fdaba02f0c8a
2159+
P 7a5b42ff74882c58493dc8b710fde73d4ff251f5d42271d84be73ceaabc01698
2160+
R e24ddedf31de297bbf4b76d307641631
21612161
U drh
2162-
Z ea09a8b203a6132b84da0854911ece51
2162+
Z ac5f82bfe64ed7224d42f062673e1893
21632163
# Remove this line to create a well-formed Fossil manifest.

manifest.uuid

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7a5b42ff74882c58493dc8b710fde73d4ff251f5d42271d84be73ceaabc01698
1+
40f0a29e6dd90fcb969d7c0e49728ba0ee8f31d9e8f502b9a21469620a8ad283

0 commit comments

Comments
 (0)