aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-09 12:56:27 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-12-18 15:15:13 +0000
commitd753d716a6288ea9ecb4c9262b63ad804fa0a6e0 (patch)
tree2ee2991f8088a1d734a9bce9e01b39c144957f74
parentp2p: use size_t for arbitrary counters instead of uint8_t (diff)
downloadmonero-d753d716a6288ea9ecb4c9262b63ad804fa0a6e0.tar.xz
fix a few leaks by throwing objects, not newed pointers to objects
Diffstat (limited to '')
-rw-r--r--src/blockchain_db/blockchain_db.cpp10
-rw-r--r--src/cryptonote_core/blockchain.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/blockchain_db/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index 07b2451b0..7e77953c8 100644
--- a/src/blockchain_db/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -197,7 +197,7 @@ uint64_t BlockchainDB::add_block( const block& blk
{
// sanity
if (blk.tx_hashes.size() != txs.size())
- throw new std::runtime_error("Inconsistent tx/hashes sizes");
+ throw std::runtime_error("Inconsistent tx/hashes sizes");
block_txn_start(false);
@@ -283,7 +283,7 @@ block BlockchainDB::get_block_from_height(const uint64_t& height) const
blobdata bd = get_block_blob_from_height(height);
block b;
if (!parse_and_validate_block_from_blob(bd, b))
- throw new DB_ERROR("Failed to parse block from blob retrieved from the db");
+ throw DB_ERROR("Failed to parse block from blob retrieved from the db");
return b;
}
@@ -293,7 +293,7 @@ block BlockchainDB::get_block(const crypto::hash& h) const
blobdata bd = get_block_blob(h);
block b;
if (!parse_and_validate_block_from_blob(bd, b))
- throw new DB_ERROR("Failed to parse block from blob retrieved from the db");
+ throw DB_ERROR("Failed to parse block from blob retrieved from the db");
return b;
}
@@ -304,7 +304,7 @@ bool BlockchainDB::get_tx(const crypto::hash& h, cryptonote::transaction &tx) co
if (!get_tx_blob(h, bd))
return false;
if (!parse_and_validate_tx_from_blob(bd, tx))
- throw new DB_ERROR("Failed to parse transaction from blob retrieved from the db");
+ throw DB_ERROR("Failed to parse transaction from blob retrieved from the db");
return true;
}
@@ -313,7 +313,7 @@ transaction BlockchainDB::get_tx(const crypto::hash& h) const
{
transaction tx;
if (!get_tx(h, tx))
- throw new TX_DNE(std::string("tx with hash ").append(epee::string_tools::pod_to_hex(h)).append(" not found in db").c_str());
+ throw TX_DNE(std::string("tx with hash ").append(epee::string_tools::pod_to_hex(h)).append(" not found in db").c_str());
return tx;
}
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 123bd194b..2fd61e1d2 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -471,7 +471,7 @@ bool Blockchain::deinit()
// memory operation), otherwise we may cause a loop.
if (m_db == NULL)
{
- throw new DB_ERROR("The db pointer is null in Blockchain, the blockchain may be corrupt!");
+ throw DB_ERROR("The db pointer is null in Blockchain, the blockchain may be corrupt!");
}
try