cerc-io/solidity
16
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

Merge pull request #7417 from ethereum/fix-7355-v2

Browse Source 
Update logic to track dynamically encoded parameters
This commit is contained in:
chriseth 2019-09-17 11:43:37 +02:00 committed by GitHub
commit 58f0f9dbea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/tools/ossfuzz/protoToAbiV2.cpp
View File

@ -653,28 +653,36 @@ void ProtoConverter::visit(ArrayType const& _x)
if (_x.info_size() == 0 || _x.info_size() > (int)s_maxArrayDimensions) if (_x.info_size() == 0 || _x.info_size() > (int)s_maxArrayDimensions)
return; return;
// Array type is dynamically encoded if one of the following is true
// - array base type is "bytes" or "string"
// - at least one array dimension is dynamically sized.
if (_x.base_type_oneof_case() == ArrayType::kDynbytesty)
m_isLastDynParamRightPadded = true;
else
for (auto const& dim: _x.info())
if (!dim.is_static())
{
m_isLastDynParamRightPadded = true;
break;
}
string baseType = {}; string baseType = {};
switch (_x.base_type_oneof_case()) switch (_x.base_type_oneof_case())
{ {
case ArrayType::kInty: case ArrayType::kInty:
baseType = getIntTypeAsString(_x.inty()); baseType = getIntTypeAsString(_x.inty());
m_isLastDynParamRightPadded = false;
break; break;
case ArrayType::kByty: case ArrayType::kByty:
baseType = getFixedByteTypeAsString(_x.byty()); baseType = getFixedByteTypeAsString(_x.byty());
m_isLastDynParamRightPadded = false;
break; break;
case ArrayType::kAdty: case ArrayType::kAdty:
baseType = getAddressTypeAsString(_x.adty()); baseType = getAddressTypeAsString(_x.adty());
m_isLastDynParamRightPadded = false;
break; break;
case ArrayType::kBoolty: case ArrayType::kBoolty:
baseType = getBoolTypeAsString(); baseType = getBoolTypeAsString();
m_isLastDynParamRightPadded = false;
break; break;
case ArrayType::kDynbytesty: case ArrayType::kDynbytesty:
baseType = bytesArrayTypeAsString(_x.dynbytesty()); baseType = bytesArrayTypeAsString(_x.dynbytesty());
m_isLastDynParamRightPadded = true;
break; break;
case ArrayType::kStty: case ArrayType::kStty:
case ArrayType::BASE_TYPE_ONEOF_NOT_SET: case ArrayType::BASE_TYPE_ONEOF_NOT_SET: