Skip to content
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

Jump to bottom

Fix short address decoding #4

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

Fix short address decoding #4

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
12 changes: 5 additions & 7 deletions contracts/RLP.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,11 @@ function toBytes32(RLPItem memory self) internal pure returns (bytes32 data, boo
function toAddress(RLPItem memory self) internal pure returns (address data, bool valid) {
if (!isData(self))
return;
(uint256 rStartPos, uint256 len) = _decode(self);
if (len != 20)
(, uint256 len) = _decode(self);
if (len > 20)
return;
assembly {
data := div(mload(rStartPos), exp(256, 12))
}
return (data, true);
(uint256 data, bool validUint) = toUint(self);
return (address(data), validUint);
}

// Get the payload offset.
Expand Down Expand Up @@ -435,4 +433,4 @@ function _validate(RLPItem memory self) internal pure returns (bool ret) {
return false;
return true;
}
}
}