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

Also check library addresses.

Browse Source
This commit is contained in:
chriseth 2017-01-24 23:36:07 +01:00
parent 605455f96b
commit 3949624a61
4 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libdevcore/CommonData.cpp
View File

@ -19,8 +19,12 @@
* @date 2014 * @date 2014
*/ */
#include "CommonData.h" #include <libdevcore/CommonData.h>
#include "Exceptions.h" #include <libdevcore/Exceptions.h>
#include <libdevcore/SHA3.h>
#include <boost/algorithm/string.hpp>
using namespace std; using namespace std;
using namespace dev; using namespace dev;
@ -95,3 +99,35 @@ bytes dev::fromHex(std::string const& _s, WhenError _throw)
} }
return ret; return ret;
} }
bool dev::passesAddressChecksum(string const& _str, bool _strict)
{
string s = _str.substr(0, 2) == "0x" ? _str.substr(2) : _str;
if (s.length() != 40)
return false;
if (!_strict && (
_str.find_first_of("abcdef") == string::npos ||
_str.find_first_of("ABCDEF") == string::npos
))
return true;
h256 hash = keccak256(boost::algorithm::to_lower_copy(s, std::locale::classic()));
for (size_t i = 0; i < 40; ++i)
{
char addressCharacter = s[i];
bool lowerCase;
if ('a' <= addressCharacter && addressCharacter <= 'f')
lowerCase = true;
else if ('A' <= addressCharacter && addressCharacter <= 'F')
lowerCase = false;
else
continue;
unsigned nibble = (unsigned(hash[i / 2]) >> (4 * (1 - (i % 2)))) & 0xf;
if ((nibble >= 8) == lowerCase)
return false;
}
return true;
}

5
libdevcore/CommonData.h
View File

@ -179,4 +179,9 @@ bool contains(T const& _t, V const& _v)
return std::end(_t) != std::find(std::begin(_t), std::end(_t), _v); return std::end(_t) != std::find(std::begin(_t), std::end(_t), _v);
} }
/// @returns true iff @a _str passess the hex address checksum test.
/// @param _strict if false, hex strings with only uppercase or only lowercase letters
/// are considered valid.
bool passesAddressChecksum(std::string const& _str, bool _strict);
} }

22
libsolidity/ast/AST.cpp
View File

@ -539,25 +539,5 @@ bool Literal::passesAddressChecksum() const
{ {
string lit = value(); string lit = value();
solAssert(lit.substr(0, 2) == "0x", "Expected hex prefix"); solAssert(lit.substr(0, 2) == "0x", "Expected hex prefix");
lit = lit.substr(2); return dev::passesAddressChecksum(lit, true);
if (lit.length() != 40)
return false;
h256 hash = keccak256(boost::algorithm::to_lower_copy(lit, std::locale::classic()));
for (size_t i = 0; i < 40; ++i)
{
char addressCharacter = lit[i];
bool lowerCase;
if ('a' <= addressCharacter && addressCharacter <= 'f')
lowerCase = true;
else if ('A' <= addressCharacter && addressCharacter <= 'F')
lowerCase = false;
else
continue;
unsigned nibble = (unsigned(hash[i / 2]) >> (4 * (1 - (i % 2)))) & 0xf;
if ((nibble >= 8) == lowerCase)
return false;
}
return true;
} }

5
solc/CommandLineInterface.cpp
View File

@ -432,6 +432,11 @@ bool CommandLineInterface::parseLibraryOption(string const& _input)
string addrString(lib.begin() + colon + 1, lib.end()); string addrString(lib.begin() + colon + 1, lib.end());
boost::trim(libName); boost::trim(libName);
boost::trim(addrString); boost::trim(addrString);
if (!passesAddressChecksum(addrString, false))
{
cerr << "Invalid checksum on library address \"" << libName << "\": " << addrString << endl;
return false;
}
bytes binAddr = fromHex(addrString); bytes binAddr = fromHex(addrString);
h160 address(binAddr, h160::AlignRight); h160 address(binAddr, h160::AlignRight);
if (binAddr.size() > 20 || address == h160()) if (binAddr.size() > 20 || address == h160())