diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-11-15 13:51:54 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2018-11-15 15:53:21 +0000 |
| commit | 2b3595d0fe056ec4245ad3177d56c1e92da1ff9e (patch) | |
| tree | b889e5f02780a6bf547cab83f7d6952f05313665 /src | |
| parent | Merge pull request #4842 (diff) | |
| download | monero-2b3595d0fe056ec4245ad3177d56c1e92da1ff9e.tar.xz | |
various: do not propagate exception through dtor
Coverity 189689, 189690, 189692, 189695
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/http_connection.h | 3 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/common/http_connection.h b/src/common/http_connection.h index 9fc6be261..554dd832b 100644 --- a/src/common/http_connection.h +++ b/src/common/http_connection.h @@ -55,7 +55,8 @@ public: { if (m_ok) { - mp_http_client->disconnect(); + try { mp_http_client->disconnect(); } + catch (...) { /* do not propagate through dtor */ } } } diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 6f919d12c..0eda7f52d 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -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): |