Adding assert to avoid a memory access violation inside of PartialMerkleTree::CalcHash()
Adding comment to assert in PartialMerkleTree::CalcHash() Adding comment on CMerkleBlock indicating it calls something that contains an assert Removing EOL whitespace
This commit is contained in:
parent
e8b95239ee
commit
8276e70de1
2 changed files with 5 additions and 0 deletions
|
@ -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) {
|
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) {
|
if (height == 0) {
|
||||||
// hash at height 0 is the txids themself
|
// hash at height 0 is the txids themself
|
||||||
return vTxid[pos];
|
return vTxid[pos];
|
||||||
|
|
|
@ -121,6 +121,8 @@ public:
|
||||||
/**
|
/**
|
||||||
* Used to relay blocks as header + vector<merkle branch>
|
* Used to relay blocks as header + vector<merkle branch>
|
||||||
* to filtered nodes.
|
* 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
|
class CMerkleBlock
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue