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

Fix crash for too large struct array indicies

Browse Source
This commit is contained in:
Mathias Baumann 2019-02-05 13:32:01 +01:00
parent d3820aa833
commit 9f431339ef
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -4,6 +4,7 @@ Bugfixes:
* Code generator: Defensively pad allocation of creationCode and runtimeCode to multiples of 32 bytes. * Code generator: Defensively pad allocation of creationCode and runtimeCode to multiples of 32 bytes.
* Parser: Disallow empty import statements. * Parser: Disallow empty import statements.
* Type Checker: Dissallow mappings with data locations other than 'storage' * Type Checker: Dissallow mappings with data locations other than 'storage'
* Type Checker: Fix internal error when a struct array index does not fit into a uint256.
* Type system: Properly report packed encoded size for arrays and structs (mostly unused until now). * Type system: Properly report packed encoded size for arrays and structs (mostly unused until now).

23
libsolidity/analysis/TypeChecker.cpp
View File

@ -2205,15 +2205,22 @@ bool TypeChecker::visit(IndexAccess const& _access)
resultType = make_shared<TypeType>(make_shared<ArrayType>(DataLocation::Memory, typeType.actualType())); resultType = make_shared<TypeType>(make_shared<ArrayType>(DataLocation::Memory, typeType.actualType()));
else else
{ {
expectType(*index, IntegerType::uint256()); u256 length = 1;
if (auto length = dynamic_cast<RationalNumberType const*>(type(*index).get())) if (expectType(*index, IntegerType::uint256()))
resultType = make_shared<TypeType>(make_shared<ArrayType>( {
DataLocation::Memory, if (auto indexValue = dynamic_cast<RationalNumberType const*>(type(*index).get()))
typeType.actualType(), length = indexValue->literalValue(nullptr);
length->literalValue(nullptr) else
)); m_errorReporter.fatalTypeError(index->location(), "Integer constant expected.");
}
else else
m_errorReporter.fatalTypeError(index->location(), "Integer constant expected."); solAssert(m_errorReporter.hasErrors(), "Expected errors as expectType returned false");
resultType = make_shared<TypeType>(make_shared<ArrayType>(
DataLocation::Memory,
typeType.actualType(),
length
));
} }
break; break;
} }

10
test/libsolidity/syntaxTests/indexing/struct_array_noninteger_index.sol Normal file
View File

@ -0,0 +1,10 @@
contract test {
struct s { uint a; uint b;}
function f() pure public returns (byte) {
s[75555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555];
s[7];
}
}
// ----
// TypeError: (101-241): Type int_const 7555...(132 digits omitted)...5555 is not implicitly convertible to expected type uint256.