nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BlockchainLMDB: Call destructor on allocated txn if setup fails

Browse Source
This commit is contained in:
warptangent 2016-02-13 03:41:22 -08:00
parent f5581c3536
commit 9118d0a44c
No known key found for this signature in database
GPG Key ID: 0E490BEBFBE4E92D
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2114,7 +2114,11 @@ void BlockchainLMDB::batch_start(uint64_t batch_num_blocks)
// NOTE: need to make sure it's destroyed properly when done // NOTE: need to make sure it's destroyed properly when done
if (auto mdb_res = mdb_txn_begin(m_env, NULL, 0, *m_write_batch_txn)) if (auto mdb_res = mdb_txn_begin(m_env, NULL, 0, *m_write_batch_txn))
{
delete m_write_batch_txn;
m_write_batch_txn = nullptr;
throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str())); throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str()));
}
// indicates this transaction is for batch transactions, but not whether it's // indicates this transaction is for batch transactions, but not whether it's
// active // active
m_write_batch_txn->m_batch_txn = true; m_write_batch_txn->m_batch_txn = true;
@ -2201,9 +2205,13 @@ void BlockchainLMDB::block_txn_start()
{ {
m_write_txn = new mdb_txn_safe(); m_write_txn = new mdb_txn_safe();
if (auto mdb_res = mdb_txn_begin(m_env, NULL, 0, *m_write_txn)) if (auto mdb_res = mdb_txn_begin(m_env, NULL, 0, *m_write_txn))
{
delete m_write_txn;
m_write_txn = nullptr;
throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str())); throw0(DB_ERROR(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str()));
} }
} }
}
void BlockchainLMDB::block_txn_stop() void BlockchainLMDB::block_txn_stop()
{ {