Merge pull request #7859
514f8fa
LMDB: protection against UB, by not calling virtual methods from destructor (mj-xmr)
This commit is contained in:
commit
e165fdb27c
|
@ -1276,11 +1276,11 @@ BlockchainLMDB::~BlockchainLMDB()
|
|||
// batch transaction shouldn't be active at this point. If it is, consider it aborted.
|
||||
if (m_batch_active)
|
||||
{
|
||||
try { batch_abort(); }
|
||||
try { BlockchainLMDB::batch_abort(); }
|
||||
catch (...) { /* ignore */ }
|
||||
}
|
||||
if (m_open)
|
||||
close();
|
||||
BlockchainLMDB::close();
|
||||
}
|
||||
|
||||
BlockchainLMDB::BlockchainLMDB(bool batch_transactions): BlockchainDB()
|
||||
|
@ -1578,9 +1578,9 @@ void BlockchainLMDB::close()
|
|||
if (m_batch_active)
|
||||
{
|
||||
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();
|
||||
|
||||
// FIXME: not yet thread safe!!! Use with care.
|
||||
|
@ -1593,7 +1593,7 @@ void BlockchainLMDB::sync()
|
|||
LOG_PRINT_L3("BlockchainLMDB::" << __func__);
|
||||
check_open();
|
||||
|
||||
if (is_read_only())
|
||||
if (BlockchainLMDB::is_read_only())
|
||||
return;
|
||||
|
||||
// Does nothing unless LMDB environment was opened with MDB_NOSYNC or in part
|
||||
|
|
Loading…
Reference in New Issue