Release v5.2 audit fixes (#5330)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com> Co-authored-by: Sam Bugs <101145325+0xsambugs@users.noreply.github.com> Co-authored-by: Ernesto García <ernestognw@gmail.com> Co-authored-by: Arr00 <13561405+arr00@users.noreply.github.com> Co-authored-by: wizard <112275929+famouswizard@users.noreply.github.com> Co-authored-by: leopardracer <136604165+leopardracer@users.noreply.github.com> Co-authored-by: cairo <cairoeth@protonmail.com>
This commit is contained in:
@ -158,7 +158,7 @@ library Strings {
|
||||
* NOTE: This function will revert if the result does not fit in a `uint256`.
|
||||
*/
|
||||
function tryParseUint(string memory input) internal pure returns (bool success, uint256 value) {
|
||||
return tryParseUint(input, 0, bytes(input).length);
|
||||
return _tryParseUintUncheckedBounds(input, 0, bytes(input).length);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -172,6 +172,19 @@ library Strings {
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) internal pure returns (bool success, uint256 value) {
|
||||
if (end > bytes(input).length || begin > end) return (false, 0);
|
||||
return _tryParseUintUncheckedBounds(input, begin, end);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Implementation of {tryParseUint} that does not check bounds. Caller should make sure that
|
||||
* `begin <= end <= input.length`. Other inputs would result in undefined behavior.
|
||||
*/
|
||||
function _tryParseUintUncheckedBounds(
|
||||
string memory input,
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) private pure returns (bool success, uint256 value) {
|
||||
bytes memory buffer = bytes(input);
|
||||
|
||||
uint256 result = 0;
|
||||
@ -216,7 +229,7 @@ library Strings {
|
||||
* NOTE: This function will revert if the absolute value of the result does not fit in a `uint256`.
|
||||
*/
|
||||
function tryParseInt(string memory input) internal pure returns (bool success, int256 value) {
|
||||
return tryParseInt(input, 0, bytes(input).length);
|
||||
return _tryParseIntUncheckedBounds(input, 0, bytes(input).length);
|
||||
}
|
||||
|
||||
uint256 private constant ABS_MIN_INT256 = 2 ** 255;
|
||||
@ -232,10 +245,23 @@ library Strings {
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) internal pure returns (bool success, int256 value) {
|
||||
if (end > bytes(input).length || begin > end) return (false, 0);
|
||||
return _tryParseIntUncheckedBounds(input, begin, end);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Implementation of {tryParseInt} that does not check bounds. Caller should make sure that
|
||||
* `begin <= end <= input.length`. Other inputs would result in undefined behavior.
|
||||
*/
|
||||
function _tryParseIntUncheckedBounds(
|
||||
string memory input,
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) private pure returns (bool success, int256 value) {
|
||||
bytes memory buffer = bytes(input);
|
||||
|
||||
// Check presence of a negative sign.
|
||||
bytes1 sign = bytes1(_unsafeReadBytesOffset(buffer, begin));
|
||||
bytes1 sign = begin == end ? bytes1(0) : bytes1(_unsafeReadBytesOffset(buffer, begin)); // don't do out-of-bound (possibly unsafe) read if sub-string is empty
|
||||
bool positiveSign = sign == bytes1("+");
|
||||
bool negativeSign = sign == bytes1("-");
|
||||
uint256 offset = (positiveSign || negativeSign).toUint();
|
||||
@ -280,7 +306,7 @@ library Strings {
|
||||
* NOTE: This function will revert if the result does not fit in a `uint256`.
|
||||
*/
|
||||
function tryParseHexUint(string memory input) internal pure returns (bool success, uint256 value) {
|
||||
return tryParseHexUint(input, 0, bytes(input).length);
|
||||
return _tryParseHexUintUncheckedBounds(input, 0, bytes(input).length);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -294,10 +320,23 @@ library Strings {
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) internal pure returns (bool success, uint256 value) {
|
||||
if (end > bytes(input).length || begin > end) return (false, 0);
|
||||
return _tryParseHexUintUncheckedBounds(input, begin, end);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Implementation of {tryParseHexUint} that does not check bounds. Caller should make sure that
|
||||
* `begin <= end <= input.length`. Other inputs would result in undefined behavior.
|
||||
*/
|
||||
function _tryParseHexUintUncheckedBounds(
|
||||
string memory input,
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) private pure returns (bool success, uint256 value) {
|
||||
bytes memory buffer = bytes(input);
|
||||
|
||||
// skip 0x prefix if present
|
||||
bool hasPrefix = bytes2(_unsafeReadBytesOffset(buffer, begin)) == bytes2("0x");
|
||||
bool hasPrefix = (end > begin + 1) && bytes2(_unsafeReadBytesOffset(buffer, begin)) == bytes2("0x"); // don't do out-of-bound (possibly unsafe) read if sub-string is empty
|
||||
uint256 offset = hasPrefix.toUint() * 2;
|
||||
|
||||
uint256 result = 0;
|
||||
@ -354,13 +393,15 @@ library Strings {
|
||||
uint256 begin,
|
||||
uint256 end
|
||||
) internal pure returns (bool success, address value) {
|
||||
// check that input is the correct length
|
||||
bool hasPrefix = bytes2(_unsafeReadBytesOffset(bytes(input), begin)) == bytes2("0x");
|
||||
if (end > bytes(input).length || begin > end) return (false, address(0));
|
||||
|
||||
bool hasPrefix = (end > begin + 1) && bytes2(_unsafeReadBytesOffset(bytes(input), begin)) == bytes2("0x"); // don't do out-of-bound (possibly unsafe) read if sub-string is empty
|
||||
uint256 expectedLength = 40 + hasPrefix.toUint() * 2;
|
||||
|
||||
// check that input is the correct length
|
||||
if (end - begin == expectedLength) {
|
||||
// length guarantees that this does not overflow, and value is at most type(uint160).max
|
||||
(bool s, uint256 v) = tryParseHexUint(input, begin, end);
|
||||
(bool s, uint256 v) = _tryParseHexUintUncheckedBounds(input, begin, end);
|
||||
return (s, address(uint160(v)));
|
||||
} else {
|
||||
return (false, address(0));
|
||||
|
||||
Reference in New Issue
Block a user