Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

wallet2: fix keys file deserialization exception handling

Browse Source
This commit is contained in:
xiphon 2020-05-05 02:30:54 +00:00
parent 8185054db7
commit 42e14840fb
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View File

@ -3978,13 +3978,7 @@ bool wallet2::load_keys(const std::string& keys_file_name, const epee::wipeable_
// Load keys from buffer // Load keys from buffer
boost::optional<crypto::chacha_key> keys_to_encrypt; boost::optional<crypto::chacha_key> keys_to_encrypt;
try { r = wallet2::load_keys_buf(keys_file_buf, password, keys_to_encrypt);
r = wallet2::load_keys_buf(keys_file_buf, password, keys_to_encrypt);
} catch (const std::exception& e) {
std::size_t found = string(e.what()).find("failed to deserialize keys buffer");
THROW_WALLET_EXCEPTION_IF(found != std::string::npos, error::wallet_internal_error, "internal error: failed to deserialize \"" + keys_file_name + '\"');
throw e;
}
// Rewrite with encrypted keys if unencrypted, ignore errors // Rewrite with encrypted keys if unencrypted, ignore errors
if (r && keys_to_encrypt != boost::none) if (r && keys_to_encrypt != boost::none)