Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-11 01:20:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

various: do not propagate exception through dtor

Browse source 
Coverity 189689, 189690, 189692, 189695
This commit is contained in:
moneromooo-monero 2018-11-15 13:51:54 +00:00
parent d0c4123034
commit 2b3595d0fe
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
4 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/common/http_connection.h
View file

@ -55,7 +55,8 @@ public:
{
if (m_ok)
{
mp_http_client->disconnect();
try { mp_http_client->disconnect(); }
catch (...) { /* do not propagate through dtor */ }
}
}

7
src/wallet/wallet2.cpp
View file

@ -815,7 +815,12 @@ wallet_keys_unlocker::~wallet_keys_unlocker()
{
if (!locked)
return;
w.encrypt_keys(key);
try { w.encrypt_keys(key); }
catch (...)
{
MERROR("Failed to re-encrypt wallet keys");
// do not propagate through dtor, we'd crash
}
}
wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended):