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 #2925 from ethereum/tuple-value-check

Browse Source 
Validate each tuple literal
This commit is contained in:
chriseth 2017-10-18 11:59:40 +02:00 committed by GitHub
commit e854da1a8c
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -24,6 +24,7 @@ Bugfixes:
* Type Checker: Prevent duplicate event declarations.
* Type Checker: Do not mark event parameters as shadowing state variables.
* Type Checker: Allow ``gas`` in view functions.
* Type Checker: Validate each number literal in tuple expressions even if they are not assigned from.
### 0.4.17 (2017-09-21)

6
libsolidity/analysis/TypeChecker.cpp
View File

@ -1293,6 +1293,12 @@ bool TypeChecker::visit(TupleExpression const& _tuple)
{
components[i]->accept(*this);
types.push_back(type(*components[i]));
// Note: code generation will visit each of the expression even if they are not assigned from.
if (types[i]->category() == Type::Category::RationalNumber && components.size() > 1)
if (!dynamic_cast<RationalNumberType const&>(*types[i]).mobileType())
m_errorReporter.fatalTypeError(components[i]->location(), "Invalid rational number.");
if (_tuple.isInlineArray())
solAssert(!!types[i], "Inline array cannot have empty components");
if (_tuple.isInlineArray())

49
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -5537,7 +5537,7 @@ BOOST_AUTO_TEST_CASE(invalid_mobile_type)
}
}
)";
CHECK_ERROR(text, TypeError, "Invalid mobile type.");
CHECK_ERROR(text, TypeError, "Invalid rational number.");
}
BOOST_AUTO_TEST_CASE(warns_msg_value_in_non_payable_public_function)
@ -7096,6 +7096,53 @@ BOOST_AUTO_TEST_CASE(non_external_fallback)
CHECK_ERROR(text, TypeError, "Fallback function must be defined as \"external\".");
}
BOOST_AUTO_TEST_CASE(invalid_literal_in_tuple)
{
char const* text = R"(
contract C {
function f() pure public {
uint x;
(x, ) = (1E111);
}
}
)";
CHECK_ERROR(text, TypeError, "is not implicitly convertible to expected type");
text = R"(
contract C {
function f() pure public {
uint x;
(x, ) = (1, 1E111);
}
}
)";
CHECK_ERROR(text, TypeError, "Invalid rational number.");
text = R"(
contract C {
function f() pure public {
uint x;
(x, ) = (1E111, 1);
}
}
)";
CHECK_ERROR(text, TypeError, "Invalid rational number.");
text = R"(
contract C {
function f() pure public {
(2**270, 1);
}
}
)";
CHECK_ERROR(text, TypeError, "Invalid rational number.");
text = R"(
contract C {
function f() pure public {
((2**270) / 2**100, 1);
}
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(warn_about_sha3)
{
char const* text = R"(