Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-28 20:26:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #333

Browse Source 
5d304ca Fix loop bug when calling core::get_block_template, causing calling thread to lock up. (NoodleDoodleNoodleDoodleNoodleDoodleNoo)
This commit is contained in:
Riccardo Spagni 2015-07-15 00:52:42 +02:00
commit 10e50a4da8
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/cryptonote_core/tx_pool.cpp
View File

@ -503,7 +503,10 @@ namespace cryptonote
// Can not exceed maximum block size // Can not exceed maximum block size
if (max_total_size < total_size + tx_it->second.blob_size) if (max_total_size < total_size + tx_it->second.blob_size)
{
sorted_it++;
continue; continue;
}
// If adding this tx will make the block size // If adding this tx will make the block size
// greater than CRYPTONOTE_GETBLOCKTEMPLATE_MAX // greater than CRYPTONOTE_GETBLOCKTEMPLATE_MAX
@ -511,7 +514,10 @@ namespace cryptonote
// keep block sizes from becoming too unwieldly // keep block sizes from becoming too unwieldly
// to propagate at 60s block times. // to propagate at 60s block times.
if ( (total_size + tx_it->second.blob_size) > CRYPTONOTE_GETBLOCKTEMPLATE_MAX_BLOCK_SIZE ) if ( (total_size + tx_it->second.blob_size) > CRYPTONOTE_GETBLOCKTEMPLATE_MAX_BLOCK_SIZE )
{
sorted_it++;
continue; continue;
}
// If we've exceeded the penalty free size, // If we've exceeded the penalty free size,
// stop including more tx // stop including more tx
@ -522,7 +528,10 @@ namespace cryptonote
// included into the blockchain or that are // included into the blockchain or that are
// missing key images // missing key images
if (!is_transaction_ready_to_go(tx_it->second) || have_key_images(k_images, tx_it->second.tx)) if (!is_transaction_ready_to_go(tx_it->second) || have_key_images(k_images, tx_it->second.tx))
{
sorted_it++;
continue; continue;
}
bl.tx_hashes.push_back(tx_it->first); bl.tx_hashes.push_back(tx_it->first);
total_size += tx_it->second.blob_size; total_size += tx_it->second.blob_size;