Skip to content

Avoid overflow on empty multiproof #4564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Amxx merged 2 commits into from
Sep 4, 2023
Merged

Avoid overflow on empty multiproof #4564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bae299e
Avoid overflow on empty multiproof
frangio Sep 2, 2023
708738c
add changeset
frangio Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/large-humans-remain.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'openzeppelin-solidity': patch
---

`MerkleProof`: Use custom error to report invalid multiproof instead of reverting with overflow panic.
4 changes: 2 additions & 2 deletions contracts/utils/cryptography/MerkleProof.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ library MerkleProof {
uint256 totalHashes = proofFlags.length;

// Check proof validity.
if (leavesLen + proofLen - 1 != totalHashes) {
if (leavesLen + proofLen != totalHashes + 1) {
revert MerkleProofInvalidMultiproof();
}

Expand Down Expand Up @@ -174,7 +174,7 @@ library MerkleProof {
uint256 totalHashes = proofFlags.length;

// Check proof validity.
if (leavesLen + proofLen - 1 != totalHashes) {
if (leavesLen + proofLen != totalHashes + 1) {
revert MerkleProofInvalidMultiproof();
}

Expand Down