cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BytesUtils: Don't format parameters shorter than 32 bytes as integers

Browse Source
This commit is contained in:
Kamil Śliwak 2023-08-17 19:52:57 +02:00
parent 368ea01bb2
commit 0f5aacefa0
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/libsolidity/util/BytesUtils.cpp
View File

@ -263,7 +263,20 @@ string BytesUtils::formatRawBytes(
auto it = _bytes.begin(); auto it = _bytes.begin();
if (_bytes.size() != ContractABIUtils::encodingSize(_parameters)) if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
parameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32); {
// Interpret all full 32-byte values as integers.
parameters = ContractABIUtils::defaultParameters(_bytes.size() / 32);
// We'd introduce trailing zero bytes if we interpreted the final bit as an integer.
// We want a right-aligned sequence of bytes instead.
if (_bytes.size() % 32 != 0)
parameters.push_back({
bytes(),
"",
ABIType{ABIType::HexString, ABIType::AlignRight, _bytes.size() % 32},
FormatInfo{},
});
}
else else
parameters = _parameters; parameters = _parameters;
soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size()); soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());
@ -371,7 +384,20 @@ string BytesUtils::formatBytesRange(
auto it = _bytes.begin(); auto it = _bytes.begin();
if (_bytes.size() != ContractABIUtils::encodingSize(_parameters)) if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
parameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32); {
// Interpret all full 32-byte values as integers.
parameters = ContractABIUtils::defaultParameters(_bytes.size() / 32);
// We'd introduce trailing zero bytes if we interpreted the final bit as an integer.
// We want a right-aligned sequence of bytes instead.
if (_bytes.size() % 32 != 0)
parameters.push_back({
bytes(),
"",
ABIType{ABIType::HexString, ABIType::AlignRight, _bytes.size() % 32},
FormatInfo{},
});
}
else else
parameters = _parameters; parameters = _parameters;
soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size()); soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());