cerc-io/solidity
16
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 #1705 from ethereum/fixasmbug

Browse Source 
Bugfix: Deposit one stack item for non-value types in inline assembly type checking.
This commit is contained in:
chriseth 2017-02-20 15:20:12 +01:00 committed by GitHub
commit 32b7d17467
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -11,6 +11,7 @@ Bugfixes:
* Commandline interface: Do not try creating paths ``.`` and ``..``. * Commandline interface: Do not try creating paths ``.`` and ``..``.
* Type system: Fix a crash caused by continuing on fatal errors in the code. * Type system: Fix a crash caused by continuing on fatal errors in the code.
* Type system: Disallow arrays with negative length. * Type system: Disallow arrays with negative length.
* Inline assembly: Charge one stack slot for non-value types during analysis.
### 0.4.9 (2017-01-31) ### 0.4.9 (2017-01-31)

2
libsolidity/analysis/TypeChecker.cpp
View File

@ -611,7 +611,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
fatalTypeError(SourceLocation(), "Constant variables not yet implemented for inline assembly."); fatalTypeError(SourceLocation(), "Constant variables not yet implemented for inline assembly.");
if (var->isLocalVariable()) if (var->isLocalVariable())
pushes = var->type()->sizeOnStack(); pushes = var->type()->sizeOnStack();
else if (var->type()->isValueType()) else if (!var->type()->isValueType())
pushes = 1; pushes = 1;
else else
pushes = 2; // slot number, intra slot offset pushes = 2; // slot number, intra slot offset

13
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -4852,6 +4852,19 @@ BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_negative_stack)
CHECK_WARNING(text, "Inline assembly block is not balanced"); CHECK_WARNING(text, "Inline assembly block is not balanced");
} }
BOOST_AUTO_TEST_CASE(inline_assembly_unbalanced_two_stack_load)
{
char const* text = R"(
contract c {
uint8 x;
function f() {
assembly { x pop }
}
}
)";
CHECK_WARNING(text, "Inline assembly block is not balanced");
}
BOOST_AUTO_TEST_CASE(inline_assembly_in_modifier) BOOST_AUTO_TEST_CASE(inline_assembly_in_modifier)
{ {
char const* text = R"( char const* text = R"(