Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Prevent deref of invalid optional on wallet import of malformed WIF key

Browse source
This commit is contained in:
Eric Frias 2015-07-06 16:05:22 -04:00
parent ce729ba9f9
commit beb2e47832
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/wallet/wallet.cpp
View file

@ -1907,7 +1907,10 @@ bool wallet_api::import_key(string account_name_or_id, string wif_key)
{ {
FC_ASSERT(!is_locked()); FC_ASSERT(!is_locked());
// backup wallet // backup wallet
string shorthash = detail::address_to_shorthash(wif_to_key(wif_key)->get_public_key()); fc::optional<fc::ecc::private_key> optional_private_key = wif_to_key(wif_key);
if (!optional_private_key)
FC_THROW("Invalid private key ${key}", ("key", wif_key));
string shorthash = detail::address_to_shorthash(optional_private_key->get_public_key());
copy_wallet_file( "before-import-key-" + shorthash ); copy_wallet_file( "before-import-key-" + shorthash );
if( my->import_key(account_name_or_id, wif_key) ) if( my->import_key(account_name_or_id, wif_key) )