rpc: fix getrawtransaction segfault

The crash would happen when querying a mempool transaction with verbosity=2, while pruning.
tientuavich1996 · Dec 5, 2023 · 494a926 · 494a926
1 parent 6d57909
commit 494a926
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -396,7 +396,7 @@ static RPCHelpMan getrawtransaction()
  LOCK(cs_main);
  blockindex = chainman.m_blockman.LookupBlockIndex(hash_block);
  }
- if (verbosity == 1) {
+ if (verbosity == 1 || !blockindex) {
  TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate());
  return result;
  }
@@ -405,8 +405,7 @@ static RPCHelpMan getrawtransaction()
  CBlock block;
  const bool is_block_pruned{WITH_LOCK(cs_main, return chainman.m_blockman.IsBlockPruned(blockindex))};
 
- if (tx->IsCoinBase() ||
- !blockindex || is_block_pruned ||
+ if (tx->IsCoinBase() || is_block_pruned ||
  !(chainman.m_blockman.UndoReadFromDisk(blockUndo, *blockindex) && chainman.m_blockman.ReadBlockFromDisk(block, *blockindex))) {
  TxToJSON(*tx, hash_block, result, chainman.ActiveChainstate());
  return result;