diff options
| author | chriseth <chris@ethereum.org> | 2017-06-13 22:42:58 +0800 |
|---|---|---|
| committer | chriseth <chris@ethereum.org> | 2017-06-14 20:26:20 +0800 |
| commit | 07cc84fadee7f1f86467a8dba435b2d5b28db268 (patch) | |
| tree | 2648b4405d12f9d5f8d53f92a15b4d05ae81752c | |
| parent | d3f4c97c533b2f64dda9fe7bdf5848f6c8bbb300 (diff) | |
| download | dexon-solidity-07cc84fadee7f1f86467a8dba435b2d5b28db268.tar.gz dexon-solidity-07cc84fadee7f1f86467a8dba435b2d5b28db268.tar.zst dexon-solidity-07cc84fadee7f1f86467a8dba435b2d5b28db268.zip | |
Fix a crash about a non-callable expression.
| -rw-r--r-- | Changelog.md | 1 | ||||
| -rw-r--r-- | libsolidity/analysis/TypeChecker.cpp | 5 | ||||
| -rw-r--r-- | test/libsolidity/SolidityNameAndTypeResolution.cpp | 15 |
3 files changed, 16 insertions, 5 deletions
diff --git a/Changelog.md b/Changelog.md index 8f1fe045..5954865c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,7 @@ Features: * Inline Assembly: introduce ``keccak256`` as an opcode. ``sha3`` is still a valid alias. Bugfixes: + * Fixed crash concerning non-callable types. * Unused variable warnings no longer issued for variables used inside inline assembly. ### 0.4.11 (2017-05-03) diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index b1911ef0..50482b8f 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -1287,14 +1287,11 @@ bool TypeChecker::visit(FunctionCall const& _functionCall) membersRemovedForStructConstructor = structType.membersMissingInMemory(); _functionCall.annotation().isPure = isPure; } - else - { - functionType = dynamic_pointer_cast<FunctionType const>(expressionType); + else if (functionType = dynamic_pointer_cast<FunctionType const>(expressionType)) _functionCall.annotation().isPure = isPure && _functionCall.expression().annotation().isPure && functionType->isPure(); - } if (!functionType) { diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index ba2ade66..dddb5dde 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -5785,6 +5785,20 @@ BOOST_AUTO_TEST_CASE(no_unused_inline_asm) CHECK_SUCCESS_NO_WARNINGS(text); } +BOOST_AUTO_TEST_CASE(callable_crash) +{ + char const* text = R"( + contract C { + struct S { uint a; bool x; } + S public s; + function C() { + 3({a: 1, x: true}); + } + } + )"; + CHECK_ERROR(text, TypeError, "Type is not callable"); +} + BOOST_AUTO_TEST_CASE(returndatacopy_as_variable) { char const* text = R"( @@ -5802,7 +5816,6 @@ BOOST_AUTO_TEST_CASE(shadowing_warning_can_be_removed) } - BOOST_AUTO_TEST_SUITE_END() } |