Commit a0d203a8 authored by Jeffrey Wilcke's avatar Jeffrey Wilcke

Merge pull request #2011 from karalabe/fix-hex-address

common: fix #2008, wrong hex prefix check
parents 7dde2b90 18ea468c
...@@ -95,10 +95,10 @@ func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) } ...@@ -95,10 +95,10 @@ func HexToAddress(s string) Address { return BytesToAddress(FromHex(s)) }
// IsHexAddress verifies whether a string can represent a valid hex-encoded // IsHexAddress verifies whether a string can represent a valid hex-encoded
// Ethereum address or not. // Ethereum address or not.
func IsHexAddress(s string) bool { func IsHexAddress(s string) bool {
if len(s) == 2+2*AddressLength && IsHex(s[2:]) { if len(s) == 2+2*AddressLength && IsHex(s) {
return true return true
} }
if len(s) == 2*AddressLength && IsHex(s) { if len(s) == 2*AddressLength && IsHex("0x"+s) {
return true return true
} }
return false return false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment