Fix getNext(unkown)

morpho-org · Dec 14, 2022 · 1702aac · 1702aac
1 parent 0cd6790
commit 1702aac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/contracts/HeapOrdering.sol b/contracts/HeapOrdering.sol
@@ -327,7 +327,8 @@ library HeapOrdering {
     /// @return The address of the next account.
     function getNext(HeapArray storage _heap, address _id) internal view returns (address) {
         uint256 rank = _heap.ranks[_id];
-        if (rank < _heap.accounts.length) return getAccount(_heap, rank + 1).id;
-        else return address(0);
+        if (rank == 0 || rank >= _heap.accounts.length) return address(0);
+
+        return getAccount(_heap, rank + 1).id;
     }
 }
diff --git a/test-foundry/TestHeapOrdering.t.sol b/test-foundry/TestHeapOrdering.t.sol
@@ -546,4 +546,9 @@ contract TestHeapOrdering is DSTest {
         hevm.expectRevert("SafeCast: value doesn't fit in 96 bits");
         update(accounts[0], uint256(type(uint128).max), 0);
     }
+
+    function testGetNextUnknown() public {
+        update(accounts[0], 0, 1);
+        assertEq(heap.getNext(address(0xdEaD)), ADDR_ZERO);
+    }
 }