From 9616470f67675d7cd4a2a3df001302d87417b03f Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Fri, 7 Oct 2016 23:59:30 +0100 Subject: Disallow magic variables in inline assembly --- Changelog.md | 3 +++ libsolidity/analysis/TypeChecker.cpp | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Changelog.md b/Changelog.md index a5a85eb5..d2efebce 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,6 +12,9 @@ Bugfixes: * Code Generator: expect zero stack increase after `super` as an expression * Inline assembly: support the `address` opcode * Inline assembly: fix parsing of assignment after a label. + * Inline assembly: external variables of unsupported type (such as `this`, `super`, etc.) + are properly detected. They are not available in inline assembly and can be used as + local variable names. ### 0.4.2 (2016-09-17) diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index ae7c13c8..b9b182c0 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -592,6 +592,10 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) unsigned pushes = 0; if (dynamic_cast(declaration)) pushes = 1; + else if (dynamic_cast(declaration)) + { + return false; + } else if (auto var = dynamic_cast(declaration)) { if (var->isConstant()) -- cgit v1.2.3 From 0a3faf48d472a6f0e49f56ac9d547ce8073f40fd Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Sat, 8 Oct 2016 00:03:56 +0100 Subject: Add tests for magic variables in inline assembly --- test/libsolidity/InlineAssembly.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp index 45eceb34..f8655c0c 100644 --- a/test/libsolidity/InlineAssembly.cpp +++ b/test/libsolidity/InlineAssembly.cpp @@ -162,6 +162,13 @@ BOOST_AUTO_TEST_CASE(assignment_after_tag) BOOST_CHECK(successParse("{ let x := 1 { tag: =: x } }")); } +BOOST_AUTO_TEST_CASE(magic_variables) +{ + BOOST_CHECK(!successAssemble("{ this }")); + BOOST_CHECK(!successAssemble("{ ecrecover }")); + BOOST_CHECK(successAssemble("{ let ecrecover := 1 ecrecover }")); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From d18e56661d039aa79e1fcccea6986868a8f8586b Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Mon, 10 Oct 2016 21:01:06 +0100 Subject: Disallow unsupported RValues in inline assembly --- libsolidity/analysis/TypeChecker.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp index b9b182c0..332ce2c3 100644 --- a/libsolidity/analysis/TypeChecker.cpp +++ b/libsolidity/analysis/TypeChecker.cpp @@ -592,10 +592,6 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) unsigned pushes = 0; if (dynamic_cast(declaration)) pushes = 1; - else if (dynamic_cast(declaration)) - { - return false; - } else if (auto var = dynamic_cast(declaration)) { if (var->isConstant()) @@ -613,6 +609,8 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly) return false; pushes = 1; } + else + return false; for (unsigned i = 0; i < pushes; ++i) _assembly.append(u256(0)); // just to verify the stack height } -- cgit v1.2.3 From 06c69c9062e6823e611bb6c24bfdbaf879421d53 Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 13 Oct 2016 12:17:52 +0200 Subject: Update Changelog.md --- Changelog.md | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Changelog.md b/Changelog.md index d2efebce..ddfd01c3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,19 +2,18 @@ Features: - * Inline assembly: support both `sucide` and `selfdestruct` opcodes - (note: `suicide` is deprecated) - * Include `keccak256()` as an alias to `sha3()` + * Inline assembly: support both ``suicide`` and ``selfdestruct`` opcodes + (note: ``suicide`` is deprecated). + * Include ``keccak256()`` as an alias to ``sha3()``. Bugfixes: - * Disallow unknown options in `solc` + * Disallow unknown options in ``solc``. * Proper type checking for bound functions. - * Code Generator: expect zero stack increase after `super` as an expression - * Inline assembly: support the `address` opcode + * Code Generator: expect zero stack increase after `super` as an expression. + * Inline assembly: support the ``address`` opcode. * Inline assembly: fix parsing of assignment after a label. - * Inline assembly: external variables of unsupported type (such as `this`, `super`, etc.) - are properly detected. They are not available in inline assembly and can be used as - local variable names. + * Inline assembly: external variables of unsupported type (such as ``this``, ``super``, etc.) + are properly detected as unusable. ### 0.4.2 (2016-09-17) -- cgit v1.2.3