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.

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

Fix short address decoding #111

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions contracts/libraries/RLP.sol
Original file line number Diff line number Diff line change
Expand Up @@ -300,16 +300,11 @@ library RLP {
/// @param self The RLPItem.
/// @return The decoded string.
function toAddress(RLPItem memory self) internal pure returns (address data) {
if(!isData(self))
revert();
uint rStartPos;
uint len;
(rStartPos, len) = _decode(self);
if (len != 20)
(, len) = _decode(self);
if (len > 20)
revert();
assembly {
data := div(mload(rStartPos), exp(256, 12))
}
return address(toUint(self));
}

// Get the payload offset.
Expand Down Expand Up @@ -424,4 +419,4 @@ library RLP {
return false;
return true;
}
}
}