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 #1737 from ethereum/localmappings

Browse Source 
Disallow uninitialized mapping variables.
This commit is contained in:
chriseth 2017-03-06 15:05:58 +01:00 committed by GitHub
commit 2fcccb97d3
4 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsolidity/analysis/TypeChecker.cpp
View File

@ -730,13 +730,16 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
if (auto ref = dynamic_cast<ReferenceType const*>(type(varDecl).get()))
{
if (ref->dataStoredIn(DataLocation::Storage))
{
warning(
varDecl.location(),
"Uninitialized storage pointer. Did you mean '<type> memory " + varDecl.name() + "'?"
);
}
}
else if (dynamic_cast<MappingType const*>(type(varDecl).get()))
typeError(
varDecl.location(),
"Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable."
);
varDecl.accept(*this);
return false;
}

8
libsolidity/interface/Exceptions.cpp
View File

@ -27,7 +27,8 @@ using namespace std;
using namespace dev;
using namespace dev::solidity;
Error::Error(Type _type): m_type(_type)
Error::Error(Type _type, SourceLocation const& _location, string const& _description):
m_type(_type)
{
switch(m_type)
{
@ -56,6 +57,11 @@ Error::Error(Type _type): m_type(_type)
solAssert(false, "");
break;
}
if (!_location.isEmpty())
*this << errinfo_sourceLocation(_location);
if (!_description.empty())
*this << errinfo_comment(_description);
}
string Exception::lineInfo() const

6
libsolidity/interface/Exceptions.h
View File

@ -53,7 +53,11 @@ public:
Warning
};
explicit Error(Type _type);
explicit Error(
Type _type,
SourceLocation const& _location = SourceLocation(),
std::string const& _description = std::string()
);
Type type() const { return m_type; }
std::string const& typeName() const { return m_typeName; }

24
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -2501,6 +2501,30 @@ BOOST_AUTO_TEST_CASE(storage_assign_to_different_local_variable)
CHECK_ERROR(sourceCode, TypeError, "");
}
BOOST_AUTO_TEST_CASE(uninitialized_mapping_variable)
{
char const* sourceCode = R"(
contract C {
function f() {
mapping(uint => uint) x;
}
}
)";
CHECK_ERROR(sourceCode, TypeError, "Uninitialized mapping. Mappings cannot be created dynamically, you have to assign them from a state variable");
}
BOOST_AUTO_TEST_CASE(uninitialized_mapping_array_variable)
{
char const* sourceCode = R"(
contract C {
function f() {
mapping(uint => uint)[] x;
}
}
)";
CHECK_WARNING(sourceCode, "Uninitialized storage pointer");
}
BOOST_AUTO_TEST_CASE(no_delete_on_storage_pointers)
{
char const* sourceCode = R"(