aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libsolidity/analysis/TypeChecker.cpp3
-rw-r--r--test/libsolidity/SolidityNameAndTypeResolution.cpp15
2 files changed, 18 insertions, 0 deletions
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 756f0e4f..857d5530 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -504,6 +504,7 @@ void TypeChecker::visitManually(
return;
}
if (parameters->size() != arguments.size())
+ {
typeError(
_modifier.location(),
"Wrong argument count for modifier invocation: " +
@@ -512,6 +513,8 @@ void TypeChecker::visitManually(
toString(parameters->size()) +
"."
);
+ return;
+ }
for (size_t i = 0; i < _modifier.arguments().size(); ++i)
if (!type(*arguments[i])->isImplicitlyConvertibleTo(*type(*(*parameters)[i])))
typeError(
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index d202942c..3ca5a6b2 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -3136,6 +3136,21 @@ BOOST_AUTO_TEST_CASE(conditional_with_all_types)
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)
{
char const* text = R"(