From e451d1e3c66350017da195335f428a96fdc7d840 Mon Sep 17 00:00:00 2001 From: stickies-v Date: Tue, 25 Jul 2023 15:41:54 +0100 Subject: [PATCH] net processing: clamp -maxorphantx to uint32_t bounds --- src/net_processing.h | 2 +- src/node/peerman_args.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/net_processing.h b/src/net_processing.h index b1e6e4eebb..619bf6220d 100644 --- a/src/net_processing.h +++ b/src/net_processing.h @@ -17,7 +17,7 @@ class ChainstateManager; /** Whether transaction reconciliation protocol should be enabled by default. */ static constexpr bool DEFAULT_TXRECONCILIATION_ENABLE{false}; /** Default for -maxorphantx, maximum number of orphan transactions kept in memory */ -static const unsigned int DEFAULT_MAX_ORPHAN_TRANSACTIONS = 100; +static const uint32_t DEFAULT_MAX_ORPHAN_TRANSACTIONS{100}; /** Default number of non-mempool transactions to keep around for block reconstruction. Includes orphan, replaced, and rejected transactions. */ static const unsigned int DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN = 100; diff --git a/src/node/peerman_args.cpp b/src/node/peerman_args.cpp index e5868ead12..1a70ce96f1 100644 --- a/src/node/peerman_args.cpp +++ b/src/node/peerman_args.cpp @@ -3,6 +3,9 @@ #include #include +#include +#include + namespace node { void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& options) @@ -10,7 +13,7 @@ void ApplyArgsManOptions(const ArgsManager& argsman, PeerManager::Options& optio if (auto value{argsman.GetBoolArg("-txreconciliation")}) options.reconcile_txs = *value; if (auto value{argsman.GetIntArg("-maxorphantx")}) { - options.max_orphan_txs = uint32_t(std::max(int64_t{0}, *value)); + options.max_orphan_txs = uint32_t((std::clamp(*value, 0, std::numeric_limits::max()))); } if (auto value{argsman.GetIntArg("-blockreconstructionextratxn")}) {