diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-28 22:39:13 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-28 22:39:13 +0800 |
| commit | a225ef9c1346a2c3122304df3e0df2af5ced10bf (patch) | |
| tree | 10f7d891d7aaa8be198eed302a3e501bf7d6355d | |
| parent | b6e137b2b44f6a45f4f3ed645841823bc51df47d (diff) | |
| parent | 9138955ba534ec074ecf55c4d02e2f3e72b29faa (diff) | |
| download | go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.tar go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.tar.gz go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.tar.bz2 go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.tar.lz go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.tar.xz go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.tar.zst go-tangerine-a225ef9c1346a2c3122304df3e0df2af5ced10bf.zip | |
Merge pull request #1140 from Gustav-Simonsson/fix_account_unlock_logging
Validate account length and avoid slicing in logging
| -rw-r--r-- | cmd/geth/main.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index eecd7546a..f82a121e7 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -340,13 +340,13 @@ func unlockAccount(ctx *cli.Context, am *accounts.Manager, account string) (pass var err error // Load startup keys. XXX we are going to need a different format - if len(account) == 0 { + if !((len(account) == 40) || (len(account) == 42)) { // with or without 0x utils.Fatalf("Invalid account address '%s'", account) } // Attempt to unlock the account 3 times attempts := 3 for tries := 0; tries < attempts; tries++ { - msg := fmt.Sprintf("Unlocking account %s...%s | Attempt %d/%d", account[:8], account[len(account)-6:], tries+1, attempts) + msg := fmt.Sprintf("Unlocking account %s | Attempt %d/%d", account, tries+1, attempts) passphrase = getPassPhrase(ctx, msg, false) err = am.Unlock(common.HexToAddress(account), passphrase) if err == nil { |