diff options
| author | Jon Atack <jon@atack.com> | 2022-07-16 13:22:46 +0200 |
|---|---|---|
| committer | Jon Atack <jon@atack.com> | 2022-07-22 12:42:27 +0200 |
| commit | 14aeece462b149eaf0d28a37d55cc169df99b2cb (patch) | |
| tree | 06650ddeffc85efe331ad49a19a1d611b5d10324 | |
| parent | 02ede4f1fde9b5aa3ff370d523f9c9858c98905c (diff) | |
CBlockIndex: ensure phashBlock is not nullptr before dereferencing
and remove a now-redundant assert preceding a GetBlockHash() caller.
This protects against UB here, and in case of failure (which would
indicate a consensus bug), the debug log will print
bitcoind: chain.h:265: uint256 CBlockIndex::GetBlockHash() const: Assertion `phashBlock != nullptr' failed.
Aborted
instead of
Segmentation fault
| -rw-r--r-- | src/chain.h | 1 | ||||
| -rw-r--r-- | src/validation.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/chain.h b/src/chain.h index ecc2ae732f..1a499b07cc 100644 --- a/src/chain.h +++ b/src/chain.h @@ -263,6 +263,7 @@ public: uint256 GetBlockHash() const { + assert(phashBlock != nullptr); return *phashBlock; } diff --git a/src/validation.cpp b/src/validation.cpp index 4c694a2c21..d53661f1f2 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2263,7 +2263,6 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state, m_blockman.m_dirty_blockindex.insert(pindex); } - assert(pindex->phashBlock); // add this block to the view's block chain view.SetBestBlock(pindex->GetBlockHash()); |