cerc-io/solidity
10
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

Assert that type identifier contains only valid characters

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-08-07 22:29:21 +01:00
parent a99347e9f0
commit 3064bd17bc
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libsolidity/ast/Types.cpp
View File

@ -254,6 +254,17 @@ string Type::escapeIdentifier(string const& _identifier)
return ret; return ret;
} }
string Type::identifier() const
{
string ret = escapeIdentifier(richIdentifier());
solAssert(ret.find_first_of("0123456789") != 0, "Identifier cannot start with a number.");
solAssert(
ret.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMONPQRSTUVWXYZ_$") == string::npos,
"Identifier contains invalid characters."
);
return ret;
}
TypePointer Type::fromElementaryTypeName(ElementaryTypeNameToken const& _type) TypePointer Type::fromElementaryTypeName(ElementaryTypeNameToken const& _type)
{ {
solAssert(Token::isElementaryTypeName(_type.token()), solAssert(Token::isElementaryTypeName(_type.token()),

2
libsolidity/ast/Types.h
View File

@ -172,7 +172,7 @@ public:
/// only if they have the same identifier. /// only if they have the same identifier.
/// The identifier should start with "t_". /// The identifier should start with "t_".
/// Will not contain any character which would be invalid as an identifier. /// Will not contain any character which would be invalid as an identifier.
std::string identifier() const { return escapeIdentifier(richIdentifier()); } std::string identifier() const;
/// More complex identifier strings use "parentheses", where $_ is interpreted as as /// More complex identifier strings use "parentheses", where $_ is interpreted as as
/// "opening parenthesis", _$ as "closing parenthesis", _$_ as "comma" and any $ that /// "opening parenthesis", _$ as "closing parenthesis", _$_ as "comma" and any $ that