Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7859 

514f8fa LMDB: protection against UB, by not calling virtual methods from destructor (mj-xmr)
This commit is contained in:
luigi1111 2021-10-17 23:25:34 -05:00
parent e7974926d5 514f8fab14
commit e165fdb27c
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -1276,11 +1276,11 @@ BlockchainLMDB::~BlockchainLMDB()
// batch transaction shouldn't be active at this point. If it is, consider it aborted. // batch transaction shouldn't be active at this point. If it is, consider it aborted.
if (m_batch_active) if (m_batch_active)
{ {
try { batch_abort(); } try { BlockchainLMDB::batch_abort(); }
catch (...) { /* ignore */ } catch (...) { /* ignore */ }
} }
if (m_open) if (m_open)
close(); BlockchainLMDB::close();
} }
BlockchainLMDB::BlockchainLMDB(bool batch_transactions): BlockchainDB() BlockchainLMDB::BlockchainLMDB(bool batch_transactions): BlockchainDB()
@ -1578,9 +1578,9 @@ void BlockchainLMDB::close()
if (m_batch_active) if (m_batch_active)
{ {
LOG_PRINT_L3("close() first calling batch_abort() due to active batch transaction"); LOG_PRINT_L3("close() first calling batch_abort() due to active batch transaction");
batch_abort(); BlockchainLMDB::batch_abort();
} }
this->sync(); BlockchainLMDB::sync();
m_tinfo.reset(); m_tinfo.reset();
// FIXME: not yet thread safe!!! Use with care. // FIXME: not yet thread safe!!! Use with care.
@ -1593,7 +1593,7 @@ void BlockchainLMDB::sync()
LOG_PRINT_L3("BlockchainLMDB::" << __func__); LOG_PRINT_L3("BlockchainLMDB::" << __func__);
check_open(); check_open();
if (is_read_only()) if (BlockchainLMDB::is_read_only())
return; return;
// Does nothing unless LMDB environment was opened with MDB_NOSYNC or in part // Does nothing unless LMDB environment was opened with MDB_NOSYNC or in part