Skip to content

fix: prevent out-of-bounds access in bytesToBytes32 #742

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −1
Open

fix: prevent out-of-bounds access in bytesToBytes32 #742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/StdStorage.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,11 @@ library stdStorageSafe {
function bytesToBytes32(bytes memory b, uint256 offset) private pure returns (bytes32) {
bytes32 out;

uint256 max = b.length > 32 ? 32 : b.length;
// Cap read length by remaining bytes from `offset`, and at most 32 bytes to avoid out-of-bounds
uint256 max = b.length > offset ? b.length - offset : 0;
if (max > 32) {
max = 32;
}
for (uint256 i = 0; i < max; i++) {
out |= bytes32(b[offset + i] & 0xFF) >> (i * 8);
}
Expand Down