i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: fixed comparison warnings in btree.

Browse Source 
* Added static_cast<uint32> to resolve type mismatch warnings between
signed integer(fSlots[level] and slot) and unsigned integers(ItemCount()) during compile

* eliminated a potential unsigned underflow vunerability when a node
is empty in NextLeaf() traversal logic

Change-Id: I8534f31cac9dec41e04e16989427dc7d9abb26ef
Reviewed-on: https://review.haiku-os.org/c/haiku/+/10363
Haiku-Format: Haiku-format Bot <[email protected]>
Reviewed-by: Fruit De La Passion <[email protected]>
Reviewed-by: Adrien Destugues <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
iamdumb
2026-02-27 12:49:55 +00:00
committed by Adrien Destugues
parent 05d6e44fc9
commit 4e5ee46880
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/btrfs/BTree.cpp
+3 -3
View File
@@ -360,7 +360,7 @@ BTree::Path::Move(int level, int step)
fSlots[level] += step; fSlots[level] += step;
if (fSlots[level] < 0) if (fSlots[level] < 0)
return -1; return -1;
if (fSlots[level] >= fNodes[level]->ItemCount()) if (static_cast<uint32>(fSlots[level]) >= fNodes[level]->ItemCount())
return 1; return 1;
return 0; return 0;
} }
@@ -371,7 +371,7 @@ BTree::Path::GetEntry(int slot, btrfs_key* _key, void** _value, uint32* _size,
uint32* _offset) uint32* _offset)
{ {
BTree::Node* leaf = fNodes[0]; BTree::Node* leaf = fNodes[0];
if (slot < 0 || slot >= leaf->ItemCount()) if (slot < 0 || static_cast<uint32>(slot) >= leaf->ItemCount())
return B_ENTRY_NOT_FOUND; return B_ENTRY_NOT_FOUND;
if (_key != NULL) if (_key != NULL)
@@ -806,7 +806,7 @@ BTree::NextLeaf(Path* path) const
// iterate to the root until satisfy the condition // iterate to the root until satisfy the condition
while (true) { while (true) {
node = path->GetNode(level, &slot); node = path->GetNode(level, &slot);
if (node == NULL || slot < node->ItemCount() - 1) if (node == NULL || static_cast<uint32>(slot + 1) < node->ItemCount())
break; break;
level++; level++;
} }