highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

node: Avoid potential UB by asserting assumptions

Browse Source
This commit is contained in:
Carl Dong
2021-03-17 16:58:22 -04:00
parent 1dd8ed7a84
commit 88aead263c
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/node/coin.cpp
View File

@@ -11,6 +11,7 @@
void FindCoins(const NodeContext& node, std::map<COutPoint, Coin>& coins) void FindCoins(const NodeContext& node, std::map<COutPoint, Coin>& coins)
{ {
assert(node.mempool); assert(node.mempool);
assert(node.chainman);
LOCK2(cs_main, node.mempool->cs); LOCK2(cs_main, node.mempool->cs);
assert(std::addressof(::ChainstateActive()) == std::addressof(node.chainman->ActiveChainstate())); assert(std::addressof(::ChainstateActive()) == std::addressof(node.chainman->ActiveChainstate()));
CCoinsViewCache& chain_view = node.chainman->ActiveChainstate().CoinsTip(); CCoinsViewCache& chain_view = node.chainman->ActiveChainstate().CoinsTip();

1
src/node/transaction.cpp
View File

@@ -38,6 +38,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t
bool callback_set = false; bool callback_set = false;
{ // cs_main scope { // cs_main scope
assert(node.chainman);
LOCK(cs_main); LOCK(cs_main);
assert(std::addressof(::ChainstateActive()) == std::addressof(node.chainman->ActiveChainstate())); assert(std::addressof(::ChainstateActive()) == std::addressof(node.chainman->ActiveChainstate()));
// If the transaction is already confirmed in the chain, don't do anything // If the transaction is already confirmed in the chain, don't do anything