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

Do not try to display checksummed address for too-short/long address literals

Browse Source
This commit is contained in:
Alex Beregszaszi 2017-10-24 10:54:51 +01:00
parent 6ebc094474
commit 1d5dd909b4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/analysis/TypeChecker.cpp
View File

@ -2000,8 +2000,8 @@ void TypeChecker::endVisit(Literal const& _literal)
m_errorReporter.warning( m_errorReporter.warning(
_literal.location(), _literal.location(),
"This looks like an address but has an invalid checksum. " "This looks like an address but has an invalid checksum. "
"If this is not used as an address, please prepend '00'. " "If this is not used as an address, please prepend '00'. " +
"Correct checksummed address: '" + _literal.getChecksummedAddress() + "'. " (!_literal.getChecksummedAddress().empty() ? "Correct checksummed address: '" + _literal.getChecksummedAddress() + "'. " : "") +
"For more information please see https://solidity.readthedocs.io/en/develop/types.html#address-literals" "For more information please see https://solidity.readthedocs.io/en/develop/types.html#address-literals"
); );
} }

2
libsolidity/ast/AST.cpp
View File

@ -587,5 +587,7 @@ bool Literal::passesAddressChecksum() const
std::string Literal::getChecksummedAddress() const std::string Literal::getChecksummedAddress() const
{ {
solAssert(isHexNumber(), "Expected hex number"); solAssert(isHexNumber(), "Expected hex number");
if (value().length != 42)
return string();
return dev::getChecksummedAddress(value()); return dev::getChecksummedAddress(value());
} }

2
libsolidity/ast/AST.h
View File

@ -1613,7 +1613,7 @@ public:
bool looksLikeAddress() const; bool looksLikeAddress() const;
/// @returns true if it passes the address checksum test. /// @returns true if it passes the address checksum test.
bool passesAddressChecksum() const; bool passesAddressChecksum() const;
/// @returns the checksummed version of an address /// @returns the checksummed version of an address (or empty string if not valid)
std::string getChecksummedAddress() const; std::string getChecksummedAddress() const;
private: private: