nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4853

Browse Source 
2b3595d0 various: do not propagate exception through dtor (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-12-04 17:07:51 +02:00
commit 398f7076bb
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/mlocker.h
View File

@ -73,7 +73,7 @@ namespace epee
mlocked(const T &&t): T(t) { mlocker::lock(this, sizeof(T)); } mlocked(const T &&t): T(t) { mlocker::lock(this, sizeof(T)); }
mlocked(const mlocked<T> &&mt): T(mt) { mlocker::lock(this, sizeof(T)); } mlocked(const mlocked<T> &&mt): T(mt) { mlocker::lock(this, sizeof(T)); }
mlocked<T> &operator=(const mlocked<T> &mt) { T::operator=(mt); return *this; } mlocked<T> &operator=(const mlocked<T> &mt) { T::operator=(mt); return *this; }
~mlocked() { mlocker::unlock(this, sizeof(T)); } ~mlocked() { try { mlocker::unlock(this, sizeof(T)); } catch (...) { /* do not propagate */ } }
}; };
template<typename T> template<typename T>

3
contrib/epee/src/mlocker.cpp
View File

@ -108,7 +108,8 @@ namespace epee
mlocker::~mlocker() mlocker::~mlocker()
{ {
unlock(ptr, len); try { unlock(ptr, len); }
catch (...) { /* ignore and do not propagate through the dtor */ }
} }
void mlocker::lock(void *ptr, size_t len) void mlocker::lock(void *ptr, size_t len)

3
src/common/http_connection.h
View File

@ -55,7 +55,8 @@ public:
{ {
if (m_ok) 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

@ -830,7 +830,12 @@ wallet_keys_unlocker::~wallet_keys_unlocker()
{ {
if (!locked) if (!locked)
return; 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): wallet2::wallet2(network_type nettype, uint64_t kdf_rounds, bool unattended):