diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-12-13 14:04:19 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-12-18 15:16:00 +0000 |
| commit | 8e60b81c48f68a2ecd8aa3cc116ae3c7b7065fef (patch) | |
| tree | a1b92ab286c9171a54835398349a1de777209e37 | |
| parent | abstract_tcp_server2: log init_server errors as fatal (diff) | |
| download | monero-8e60b81c48f68a2ecd8aa3cc116ae3c7b7065fef.tar.xz | |
cryptonote_core: fix db leak on error
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 1 | ||||
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index e774dd794..6e45417c0 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -321,6 +321,7 @@ bool Blockchain::init(BlockchainDB* db, const bool testnet, bool offline, const if (!db->is_open()) { LOG_ERROR("Attempted to init Blockchain with unopened DB"); + delete db; return false; } diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 415657f9c..470a99aa4 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -377,7 +377,7 @@ namespace cryptonote // folder might not be a directory, etc, etc catch (...) { } - BlockchainDB* db = new_db(db_type); + std::unique_ptr<BlockchainDB> db(new_db(db_type)); if (db == NULL) { LOG_ERROR("Attempted to use non-existent database type"); @@ -468,7 +468,7 @@ namespace cryptonote m_blockchain_storage.set_user_options(blocks_threads, blocks_per_sync, sync_mode, fast_sync); - r = m_blockchain_storage.init(db, m_testnet, m_offline, test_options); + r = m_blockchain_storage.init(db.release(), m_testnet, m_offline, test_options); r = m_mempool.init(); CHECK_AND_ASSERT_MES(r, false, "Failed to initialize memory pool"); |