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 #2381 from ethereum/fixcrash

Browse Source 
Fix a crash about a non-callable expression.
This commit is contained in:
chriseth 2017-06-14 18:35:38 +02:00 committed by GitHub
commit f008ddf836
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -9,6 +9,7 @@ Features:
* Inline Assembly: introduce ``keccak256`` as an opcode. ``sha3`` is still a valid alias. * Inline Assembly: introduce ``keccak256`` as an opcode. ``sha3`` is still a valid alias.
Bugfixes: Bugfixes:
* Fixed crash concerning non-callable types.
* Unused variable warnings no longer issued for variables used inside inline assembly. * Unused variable warnings no longer issued for variables used inside inline assembly.
* Inline Assembly: Enforce function arguments when parsing functional instructions. * Inline Assembly: Enforce function arguments when parsing functional instructions.

5
libsolidity/analysis/TypeChecker.cpp
View File

@ -1287,14 +1287,11 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
membersRemovedForStructConstructor = structType.membersMissingInMemory(); membersRemovedForStructConstructor = structType.membersMissingInMemory();
_functionCall.annotation().isPure = isPure; _functionCall.annotation().isPure = isPure;
} }
else else if ((functionType = dynamic_pointer_cast<FunctionType const>(expressionType)))
{
functionType = dynamic_pointer_cast<FunctionType const>(expressionType);
_functionCall.annotation().isPure = _functionCall.annotation().isPure =
isPure && isPure &&
_functionCall.expression().annotation().isPure && _functionCall.expression().annotation().isPure &&
functionType->isPure(); functionType->isPure();
}
if (!functionType) if (!functionType)
{ {

15
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -5785,6 +5785,20 @@ BOOST_AUTO_TEST_CASE(no_unused_inline_asm)
CHECK_SUCCESS_NO_WARNINGS(text); 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) BOOST_AUTO_TEST_CASE(returndatacopy_as_variable)
{ {
char const* text = R"( char const* text = R"(
@ -5810,7 +5824,6 @@ BOOST_AUTO_TEST_CASE(shadowing_warning_can_be_removed)
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }