diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:07:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-12-04 17:07:51 +0200 |
| commit | 398f7076bb67d749d76a1b275e5bd771e9714b4b (patch) | |
| tree | 792b06ae57ec00c1b5d704655a7d81cf7fbe7064 /contrib | |
| parent | Merge pull request #4850 (diff) | |
| parent | various: do not propagate exception through dtor (diff) | |
| download | monero-398f7076bb67d749d76a1b275e5bd771e9714b4b.tar.xz | |
Merge pull request #4853
2b3595d0 various: do not propagate exception through dtor (moneromooo-monero)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/mlocker.h | 2 | ||||
| -rw-r--r-- | contrib/epee/src/mlocker.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/epee/include/mlocker.h b/contrib/epee/include/mlocker.h index d2fc2ed58..a6d94b3d2 100644 --- a/contrib/epee/include/mlocker.h +++ b/contrib/epee/include/mlocker.h @@ -73,7 +73,7 @@ namespace epee mlocked(const T &&t): T(t) { 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() { mlocker::unlock(this, sizeof(T)); } + ~mlocked() { try { mlocker::unlock(this, sizeof(T)); } catch (...) { /* do not propagate */ } } }; template<typename T> diff --git a/contrib/epee/src/mlocker.cpp b/contrib/epee/src/mlocker.cpp index c3262e8f4..09ef861ac 100644 --- a/contrib/epee/src/mlocker.cpp +++ b/contrib/epee/src/mlocker.cpp @@ -108,7 +108,8 @@ namespace epee 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) |