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 #2450 from ethereum/addressstring

Browse Source 
Fix for strings treated as addresses.
This commit is contained in:
Alex Beregszaszi 2017-06-26 12:18:33 +01:00 committed by GitHub
commit 751ba701bc
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -19,6 +19,7 @@ Bugfixes:
* Type Checker: Fix address literals not being treated as compile-time constants.
* Type Checker: Disallow invoking the same modifier multiple times.
* Type Checker: Make UTF8-validation a bit more sloppy to include more valid sequences.
* Type Checker: Do not treat strings that look like addresses as addresses.
* Fixed crash concerning non-callable types.
* Unused variable warnings no longer issued for variables used inside inline assembly.
* Code Generator: Fix ABI encoding of empty literal string.

2
libsolidity/ast/AST.cpp
View File

@ -534,6 +534,8 @@ bool Literal::looksLikeAddress() const
{
if (subDenomination() != SubDenomination::None)
return false;
if (token() != Token::Number)
return false;
string lit = value();
return lit.substr(0, 2) == "0x" && abs(int(lit.length()) - 42) <= 1;

19
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -5487,6 +5487,25 @@ BOOST_AUTO_TEST_CASE(invalid_address_length)
CHECK_WARNING(text, "checksum");
}
BOOST_AUTO_TEST_CASE(address_test_for_bug_in_implementation)
{
// A previous implementation claimed the string would be an address
char const* text = R"(
contract AddrString {
address public test = "0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c";
}
)";
CHECK_ERROR(text, TypeError, "is not implicitly convertible to expected type address");
text = R"(
contract AddrString {
function f() returns (address) {
return "0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c";
}
}
)";
CHECK_ERROR(text, TypeError, "is not implicitly convertible to expected type");
}
BOOST_AUTO_TEST_CASE(early_exit_on_fatal_errors)
{
// This tests a crash that occured because we did not stop for fatal errors.