Merge pull request #4853

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

View file

@ -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)