monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplewallet: guard against I/O exceptions

Browse source 
CID 175308
This commit is contained in:
moneromooo-monero 2017-09-09 11:34:45 +01:00
parent 06c1e05735
commit 4230876b31
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/simplewallet/simplewallet.cpp
View file

@ -1708,9 +1708,18 @@ bool simple_wallet::open_wallet(const boost::program_options::variables_map& vm)
catch (const std::exception& e) catch (const std::exception& e)
{ {
fail_msg_writer() << tr("failed to load wallet: ") << e.what(); fail_msg_writer() << tr("failed to load wallet: ") << e.what();
// only suggest removing cache if the password was actually correct if (m_wallet)
if (m_wallet && m_wallet->verify_password(password)) {
fail_msg_writer() << boost::format(tr("You may want to remove the file \"%s\" and try again")) % m_wallet_file; // only suggest removing cache if the password was actually correct
bool password_is_correct = false;
try
{
password_is_correct = m_wallet->verify_password(password);
}
catch (...) { } // guard against I/O errors
if (password_is_correct)
fail_msg_writer() << boost::format(tr("You may want to remove the file \"%s\" and try again")) % m_wallet_file;
}
return false; return false;
} }
success_msg_writer() << success_msg_writer() <<