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 #4724 from ethereum/slot-in-assembly

Browse Source 
Do not crash on using _slot and _offset suffixes on their own
This commit is contained in:
Alex Beregszaszi 2018-08-07 12:55:40 +01:00 committed by GitHub
commit 8b2d630275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -81,6 +81,7 @@ Bugfixes:
* Code Generator: Fix allocation of byte arrays (zeroed out too much memory). * Code Generator: Fix allocation of byte arrays (zeroed out too much memory).
* Commandline Interface: Correctly handle paths with backslashes on windows. * Commandline Interface: Correctly handle paths with backslashes on windows.
* Fix NatSpec json output for `@notice` and `@dev` tags on contract definitions. * Fix NatSpec json output for `@notice` and `@dev` tags on contract definitions.
* References Resolver: Do not crash on using ``_slot`` and ``_offset`` suffixes on their own.
* References Resolver: Enforce ``storage`` as data location for mappings. * References Resolver: Enforce ``storage`` as data location for mappings.
* References Resolver: Report error instead of assertion fail when FunctionType has an undeclared type as parameter. * References Resolver: Report error instead of assertion fail when FunctionType has an undeclared type as parameter.
* Type Checker: Disallow assignments to mappings within tuple assignments as well. * Type Checker: Disallow assignments to mappings within tuple assignments as well.

5
libsolidity/analysis/ReferencesResolver.cpp
View File

@ -256,6 +256,11 @@ bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
string("_slot").size() : string("_slot").size() :
string("_offset").size() string("_offset").size()
)); ));
if (realName.empty())
{
declarationError(_identifier.location, "In variable names _slot and _offset can only be used as a suffix.");
return size_t(-1);
}
declarations = m_resolver.nameFromCurrentScope(realName); declarations = m_resolver.nameFromCurrentScope(realName);
} }
if (declarations.size() != 1) if (declarations.size() != 1)

9
test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_offset.sol Normal file
View File

@ -0,0 +1,9 @@
contract C {
function f() public pure {
assembly {
_offset
}
}
}
// ----
// DeclarationError: (75-82): In variable names _slot and _offset can only be used as a suffix.

9
test/libsolidity/syntaxTests/inlineAssembly/storage_reference_empty_slot.sol Normal file
View File

@ -0,0 +1,9 @@
contract C {
function f() public pure {
assembly {
_slot
}
}
}
// ----
// DeclarationError: (75-80): In variable names _slot and _offset can only be used as a suffix.