phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rpc: fix getrawtransaction segfault

Browse source 
The crash would happen when querying a mempool transaction with verbosity=2, while pruning.
This commit is contained in:
Martin Zumsande 2023-12-05 13:07:39 -05:00
parent 6d5790956f
commit 494a926d05
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rpc/rawtransaction.cpp
View file

@ -396,7 +396,7 @@ static RPCHelpMan getrawtransaction()
LOCK(cs_main); LOCK(cs_main);
blockindex = chainman.m_blockman.LookupBlockIndex(hash_block); blockindex = chainman.m_blockman.LookupBlockIndex(hash_block);
} }
if (verbosity == 1) { if (verbosity == 1 || !blockindex) {
TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate()); TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate());
return result; return result;
} }
@ -405,8 +405,7 @@ static RPCHelpMan getrawtransaction()
CBlock block; CBlock block;
const bool is_block_pruned{WITH_LOCK(cs_main, return chainman.m_blockman.IsBlockPruned(blockindex))}; const bool is_block_pruned{WITH_LOCK(cs_main, return chainman.m_blockman.IsBlockPruned(blockindex))};
if (tx->IsCoinBase() || if (tx->IsCoinBase() || is_block_pruned ||
!blockindex || is_block_pruned ||
!(chainman.m_blockman.UndoReadFromDisk(blockUndo, *blockindex) && chainman.m_blockman.ReadBlockFromDisk(block, *blockindex))) { !(chainman.m_blockman.UndoReadFromDisk(blockUndo, *blockindex) && chainman.m_blockman.ReadBlockFromDisk(block, *blockindex))) {
TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate()); TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate());
return result; return result;