From 7cbf6a86dda594dd880d77eaa399a345bd2d8659 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 17 Nov 2016 12:29:06 +0100 Subject: [PATCH 1/3] test: add a test about storing an invalid boolean --- test/libsolidity/SolidityEndToEndTest.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index da725581b..26d4ff4ae 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -3702,6 +3702,27 @@ BOOST_AUTO_TEST_CASE(enum_explicit_overflow) BOOST_CHECK(callContractFunction("getChoiceExp(uint256)", 0) == encodeArgs(0)); } +BOOST_AUTO_TEST_CASE(storing_invalid_boolean) +{ + char const* sourceCode = R"( + contract C { + bool public perm; + function set() returns(uint) { + bool tmp; + assembly { + tmp := 5 + } + perm = tmp; + return 1; + } + } + )"; + compileAndRun(sourceCode); + BOOST_CHECK(callContractFunction("set()") == encodeArgs(1)); + BOOST_CHECK(callContractFunction("perm()") == encodeArgs(1)); +} + + BOOST_AUTO_TEST_CASE(using_contract_enums_with_explicit_contract_name) { char const* sourceCode = R"( From fdc9ef14ad02d6f940a3b5789810bc63f80cdd40 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 17 Nov 2016 12:39:22 +0100 Subject: [PATCH 2/3] test: add an assertion about storing an invalid boolean into the memory --- test/libsolidity/SolidityEndToEndTest.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 26d4ff4ae..50096792f 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -3715,11 +3715,19 @@ BOOST_AUTO_TEST_CASE(storing_invalid_boolean) perm = tmp; return 1; } + function ret() returns(bool) { + bool tmp; + assembly { + tmp := 5 + } + return tmp; + } } )"; compileAndRun(sourceCode); BOOST_CHECK(callContractFunction("set()") == encodeArgs(1)); BOOST_CHECK(callContractFunction("perm()") == encodeArgs(1)); + BOOST_CHECK(callContractFunction("ret()") == encodeArgs(1)); } From 4dfc413b8e6e8f687fb19b1a39e0d2006f373579 Mon Sep 17 00:00:00 2001 From: Yoichi Hirai Date: Thu, 17 Nov 2016 13:36:17 +0100 Subject: [PATCH 3/3] test: add a test passing an invalid boolean value as an event argument Fixes #1381 --- test/libsolidity/SolidityEndToEndTest.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 50096792f..a6c01283c 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -3706,6 +3706,7 @@ BOOST_AUTO_TEST_CASE(storing_invalid_boolean) { char const* sourceCode = R"( contract C { + event Ev(bool); bool public perm; function set() returns(uint) { bool tmp; @@ -3722,12 +3723,26 @@ BOOST_AUTO_TEST_CASE(storing_invalid_boolean) } return tmp; } + function ev() returns(uint) { + bool tmp; + assembly { + tmp := 5 + } + Ev(tmp); + return 1; + } } )"; compileAndRun(sourceCode); BOOST_CHECK(callContractFunction("set()") == encodeArgs(1)); BOOST_CHECK(callContractFunction("perm()") == encodeArgs(1)); BOOST_CHECK(callContractFunction("ret()") == encodeArgs(1)); + BOOST_CHECK(callContractFunction("ev()") == encodeArgs(1)); + BOOST_REQUIRE_EQUAL(m_logs.size(), 1); + BOOST_CHECK_EQUAL(m_logs[0].address, m_contractAddress); + BOOST_CHECK(m_logs[0].data == encodeArgs(1)); + BOOST_REQUIRE_EQUAL(m_logs[0].topics.size(), 1); + BOOST_CHECK_EQUAL(m_logs[0].topics[0], dev::keccak256(string("Ev(bool)"))); }