Minecon724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix escalation source block check (#1282)

Browse source
This commit is contained in:
SergiySW 2018-10-11 01:54:11 +03:00 • committed by Roy Keene
commit 95a86c1660
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rai/node/node.cpp
View file

@ -3674,22 +3674,28 @@ void rai::active_transactions::announce_votes ()
if there are less than 100 active elections */
if (i->announcements % announcement_long == 1 && roots.size () < 100)
{
std::unique_ptr<rai::block> previous (nullptr);
auto previous_hash (election_l->status.winner->previous ());
if (!previous_hash.is_zero ())
{
auto previous (node.store.block_get (transaction, previous_hash));
previous = node.store.block_get (transaction, previous_hash);
if (previous != nullptr)
{
add (std::make_pair (std::move (previous), nullptr));
}
}
auto source_hash (node.ledger.block_source (transaction, *election_l->status.winner));
if (!source_hash.is_zero ())
/* If previous block not existing/not commited yet, block_source can cause segfault for state blocks
So source check can be done only if previous != nullptr or previous is 0 (open account) */
if (previous_hash.is_zero () || previous != nullptr)
{
auto source (node.store.block_get (transaction, source_hash));
if (source != nullptr)
auto source_hash (node.ledger.block_source (transaction, *election_l->status.winner));
if (!source_hash.is_zero ())
{
add (std::make_pair (std::move (source), nullptr));
auto source (node.store.block_get (transaction, source_hash));
if (source != nullptr)
{
add (std::make_pair (std::move (source), nullptr));
}
}
}
}

7
rai/secure/ledger.cpp
View file

@ -729,6 +729,13 @@ rai::block_hash rai::ledger::block_destination (rai::transaction const & transac
rai::block_hash rai::ledger::block_source (rai::transaction const & transaction_a, rai::block const & block_a)
{
/*
* block_source() requires that the previous block of the block
* passed in exist in the database. This is because it will try
* to check account balances to determine if it is a send block.
*/
assert (block_a.previous ().is_zero () || store.block_exists (transaction_a, block_a.previous ()));
// If block_a.source () is nonzero, then we have our source.
// However, universal blocks will always return zero.
rai::block_hash result (block_a.source ());