Merge 40bc501bf4 into merged_master (Bitcoin PR bitcoin/bitcoin#29031)

This commit is contained in:
Byron Hambly 2025-11-11 15:49:42 +02:00
commit 53b76bc1da
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
5 changed files with 9 additions and 8 deletions

View file

@ -4357,7 +4357,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
m_txrequest.ForgetTxHash(tx.GetWitnessHash());
// DoS prevention: do not allow m_orphanage to grow unbounded (see CVE-2012-3789)
m_orphanage.LimitOrphans(m_opts.max_orphan_txs);
m_orphanage.LimitOrphans(m_opts.max_orphan_txs, m_rng);
} else {
LogPrint(BCLog::MEMPOOL, "not keeping orphan with rejected parents %s (wtxid=%s)\n",
tx.GetHash().ToString(),