Skip to content

Commit

Permalink
Adding assert to avoid a memory access violation inside of PartialMer…
Browse files Browse the repository at this point in the history
…kleTree::CalcHash()

Adding comment to assert in PartialMerkleTree::CalcHash()

Adding comment on CMerkleBlock indicating it calls something that contains an assert

Removing EOL whitespace
  • Loading branch information
Christewart committed Jul 12, 2017
1 parent e8b9523 commit 8276e70
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/merkleblock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ CMerkleBlock::CMerkleBlock(const CBlock& block, const std::set<uint256>& txids)
}

uint256 CPartialMerkleTree::CalcHash(int height, unsigned int pos, const std::vector<uint256> &vTxid) {
//we can never have zero txs in a merkle block, we always need the coinbase tx
//if we do not have this assert, we can hit a memory access violation when indexing into vTxid
assert(vTxid.size() != 0);
if (height == 0) {
// hash at height 0 is the txids themself
return vTxid[pos];
Expand Down
2 changes: 2 additions & 0 deletions src/merkleblock.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ class CPartialMerkleTree
/**
* Used to relay blocks as header + vector<merkle branch>
* to filtered nodes.
*
* NOTE: The class assumes that the given CBlock has *at least* 1 transaction. If the CBlock has 0 txs, it will hit an assertion.
*/
class CMerkleBlock
{
Expand Down

0 comments on commit 8276e70

Please sign in to comment.