blockchain: call deinit in dtor

This ensures the io service that runs in another thread cannot
access data after it's deleted
release-v0.5.0
moneromooo-monero 6 years ago committed by wowario
parent a121320fc9
commit 4bd63dab9d
No known key found for this signature in database
GPG Key ID: 24DCBE762DE9C111

@ -128,6 +128,11 @@ Blockchain::Blockchain(tx_memory_pool& tx_pool) :
LOG_PRINT_L3("Blockchain::" << __func__); LOG_PRINT_L3("Blockchain::" << __func__);
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
Blockchain::~Blockchain()
{
deinit();
}
//------------------------------------------------------------------
bool Blockchain::have_tx(const crypto::hash &id) const bool Blockchain::have_tx(const crypto::hash &id) const
{ {
LOG_PRINT_L3("Blockchain::" << __func__); LOG_PRINT_L3("Blockchain::" << __func__);
@ -507,15 +512,13 @@ bool Blockchain::deinit()
// as this should be called if handling a SIGSEGV, need to check // as this should be called if handling a SIGSEGV, need to check
// if m_db is a NULL pointer (and thus may have caused the illegal // if m_db is a NULL pointer (and thus may have caused the illegal
// memory operation), otherwise we may cause a loop. // memory operation), otherwise we may cause a loop.
if (m_db == NULL)
{
throw DB_ERROR("The db pointer is null in Blockchain, the blockchain may be corrupt!");
}
try try
{ {
m_db->close(); if (m_db)
MTRACE("Local blockchain read/write activity stopped successfully"); {
m_db->close();
MTRACE("Local blockchain read/write activity stopped successfully");
}
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {

@ -120,6 +120,11 @@ namespace cryptonote
*/ */
Blockchain(tx_memory_pool& tx_pool); Blockchain(tx_memory_pool& tx_pool);
/**
* @brief Blockchain destructor
*/
~Blockchain();
/** /**
* @brief Initialize the Blockchain state * @brief Initialize the Blockchain state
* *

Loading…
Cancel
Save