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

Merge pull request #392 from chriseth/fixsegfault

Browse Source 
Fixsegfault
This commit is contained in:
chriseth 2016-02-13 01:24:40 +01:00
commit a14185a5cb
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsolidity/analysis/TypeChecker.cpp
View File

@ -504,6 +504,7 @@ void TypeChecker::visitManually(
return; return;
} }
if (parameters->size() != arguments.size()) if (parameters->size() != arguments.size())
{
typeError( typeError(
_modifier.location(), _modifier.location(),
"Wrong argument count for modifier invocation: " + "Wrong argument count for modifier invocation: " +
@ -512,6 +513,8 @@ void TypeChecker::visitManually(
toString(parameters->size()) + toString(parameters->size()) +
"." "."
); );
return;
}
for (size_t i = 0; i < _modifier.arguments().size(); ++i) for (size_t i = 0; i < _modifier.arguments().size(); ++i)
if (!type(*arguments[i])->isImplicitlyConvertibleTo(*type(*(*parameters)[i]))) if (!type(*arguments[i])->isImplicitlyConvertibleTo(*type(*(*parameters)[i])))
typeError( typeError(

15
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -3136,6 +3136,21 @@ BOOST_AUTO_TEST_CASE(conditional_with_all_types)
BOOST_CHECK(success(text)); BOOST_CHECK(success(text));
} }
BOOST_AUTO_TEST_CASE(constructor_call_invalid_arg_count)
{
// This caused a segfault in an earlier version
char const* text = R"(
contract C {
function C(){}
}
contract D is C {
function D() C(5){}
}
)";
BOOST_CHECK(expectError(text) == Error::Type::TypeError);
}
BOOST_AUTO_TEST_CASE(index_access_for_bytes) BOOST_AUTO_TEST_CASE(index_access_for_bytes)
{ {
char const* text = R"( char const* text = R"(