From 59a8366bb18653f14142321a9d85377ceaef8fad Mon Sep 17 00:00:00 2001 From: Riccardo Spagni Date: Thu, 25 Sep 2014 08:24:42 +0200 Subject: Revert "low risk, potentially varint overflow bug patched thanks to BBR" This reverts commit 4e2b2b942daa4206ec44c66e59863670dfe3fde4. --- src/cryptonote_core/tx_pool.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/cryptonote_core/tx_pool.cpp') diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 3764cfe77..81f932014 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -59,9 +59,9 @@ namespace cryptonote } //--------------------------------------------------------------------------------- - bool tx_memory_pool::add_tx(const transaction &tx, const crypto::hash &id, tx_verification_context& tvc, bool kept_by_block) + bool tx_memory_pool::add_tx(const transaction &tx, /*const crypto::hash& tx_prefix_hash,*/ const crypto::hash &id, size_t blob_size, tx_verification_context& tvc, bool kept_by_block) { - size_t blob_size = get_object_blobsize(tx); + if(!check_inputs_types_supported(tx)) { @@ -179,8 +179,9 @@ namespace cryptonote bool tx_memory_pool::add_tx(const transaction &tx, tx_verification_context& tvc, bool keeped_by_block) { crypto::hash h = null_hash; - get_transaction_hash(tx, h); - return add_tx(tx, h, tvc, keeped_by_block); + size_t blob_size = 0; + get_transaction_hash(tx, h, blob_size); + return add_tx(tx, h, blob_size, tvc, keeped_by_block); } //--------------------------------------------------------------------------------- bool tx_memory_pool::remove_transaction_keyimages(const transaction& tx) -- cgit v1.2.3