NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search the whole checkpoint trace if offset overflows during initial exponential search. (#3662)

Browse Source
This commit is contained in:
Hadrien Croubois
2022-08-30 22:59:23 +02:00
committed by GitHub
parent 71aaca2d9d
commit affe2456ea
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/utils/Checkpoints.sol
View File

@ -237,7 +237,7 @@ library Checkpoints {
offset <<= 1; offset <<= 1;
} }
uint256 low = offset < length ? length - offset : 0; uint256 low = 0 < offset && offset < length ? length - offset : 0;
uint256 high = length - (offset >> 1); uint256 high = length - (offset >> 1);
uint256 pos = _upperBinaryLookup(self._checkpoints, key, low, high); uint256 pos = _upperBinaryLookup(self._checkpoints, key, low, high);
@ -392,7 +392,7 @@ library Checkpoints {
offset <<= 1; offset <<= 1;
} }
uint256 low = offset < length ? length - offset : 0; uint256 low = 0 < offset && offset < length ? length - offset : 0;
uint256 high = length - (offset >> 1); uint256 high = length - (offset >> 1);
uint256 pos = _upperBinaryLookup(self._checkpoints, key, low, high); uint256 pos = _upperBinaryLookup(self._checkpoints, key, low, high);

2
scripts/generate/templates/Checkpoints.js
View File

@ -83,7 +83,7 @@ function upperLookupRecent(${opts.historyTypeName} storage self, ${opts.keyTypeN
offset <<= 1; offset <<= 1;
} }
uint256 low = offset < length ? length - offset : 0; uint256 low = 0 < offset && offset < length ? length - offset : 0;
uint256 high = length - (offset >> 1); uint256 high = length - (offset >> 1);
uint256 pos = _upperBinaryLookup(self.${opts.checkpointFieldName}, key, low, high); uint256 pos = _upperBinaryLookup(self.${opts.checkpointFieldName}, key, low, high);