mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-02-11 09:42:17 +01:00
Merge #10898: Fix invalid checks (NULL checks after dereference, redundant checks, etc.)
76fed83Avoid NULL pointer dereference when _walletModel is NULL (which is valid) (practicalswift)4971a9aUse two boolean literals instead of re-using variable (practicalswift)b5fb339Remove duplicate uriParts.size() > 0 check (practicalswift)7466991Remove redundant check (!ecc is always true) (practicalswift)55224afRemove redundant NULL checks after new (practicalswift) Pull request description: Contains: * Remove redundant `NULL` checks after throwing `new` * Remove redundant check (`!ecc` is always true) * Remove duplicate `uriParts.size() > 0` check * Use two boolean literals instead of re-using variable Tree-SHA512: 30e9af8a9d5c8184836f8267b492aeb4e26eca171a3be08f634b3f39b3055b9fa9f06623f6c69b294ca13bf99743f7645cfac2b25e014ff74687bd085a997895
This commit is contained in:
@@ -2613,7 +2613,6 @@ static CBlockIndex* AddToBlockIndex(const CBlockHeader& block)
|
||||
|
||||
// Construct new block index object
|
||||
CBlockIndex* pindexNew = new CBlockIndex(block);
|
||||
assert(pindexNew);
|
||||
// We assign the sequence id to blocks only when the full data is available,
|
||||
// to avoid miners withholding blocks but broadcasting headers, to get a
|
||||
// competitive advantage.
|
||||
@@ -3443,8 +3442,6 @@ CBlockIndex * InsertBlockIndex(uint256 hash)
|
||||
|
||||
// Create new
|
||||
CBlockIndex* pindexNew = new CBlockIndex();
|
||||
if (!pindexNew)
|
||||
throw std::runtime_error(std::string(__func__) + ": new CBlockIndex failed");
|
||||
mi = mapBlockIndex.insert(std::make_pair(hash, pindexNew)).first;
|
||||
pindexNew->phashBlock = &((*mi).first);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user