monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-22 19:49:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a few leaks by throwing objects, not newed pointers to objects

Browse source
This commit is contained in:
moneromooo-monero 2017-12-09 12:56:27 +00:00
parent fe568db83d
commit d753d716a6
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/blockchain_db/blockchain_db.cpp
View file

@ -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;
}

2
src/cryptonote_core/blockchain.cpp
View file

@ -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