aboutsummaryrefslogtreecommitdiff
path: root/src/test/fuzz/util.cpp
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2021-01-23 19:39:30 +0100
committerMarcoFalke <falke.marco@gmail.com>2021-01-23 20:04:37 +0100
commitfad3d7625aa1c2b6c343946e709e87e7168f9d9d (patch)
tree9a6492606d0413e8d6d5089a12d8d0f280e35f58 /src/test/fuzz/util.cpp
parentfa99e33aebed0109630474e11183b0726b410c2e (diff)
downloadbitcoin-fad3d7625aa1c2b6c343946e709e87e7168f9d9d.tar.xz
fuzz: Avoid initializing version to less than MIN_PEER_PROTO_VERSION
Diffstat (limited to 'src/test/fuzz/util.cpp')
-rw-r--r--src/test/fuzz/util.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/test/fuzz/util.cpp b/src/test/fuzz/util.cpp
index dbd4f5798c..0a541e4186 100644
--- a/src/test/fuzz/util.cpp
+++ b/src/test/fuzz/util.cpp
@@ -3,18 +3,21 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <test/fuzz/util.h>
+#include <version.h>
-void FillNode(FuzzedDataProvider& fuzzed_data_provider, CNode& node, const std::optional<int32_t>& version_in) noexcept
+void FillNode(FuzzedDataProvider& fuzzed_data_provider, CNode& node, bool init_version) noexcept
{
const ServiceFlags remote_services = ConsumeWeakEnum(fuzzed_data_provider, ALL_SERVICE_FLAGS);
const NetPermissionFlags permission_flags = ConsumeWeakEnum(fuzzed_data_provider, ALL_NET_PERMISSION_FLAGS);
- const int32_t version = version_in.value_or(fuzzed_data_provider.ConsumeIntegral<int32_t>());
+ const int32_t version = fuzzed_data_provider.ConsumeIntegralInRange<int32_t>(MIN_PEER_PROTO_VERSION, std::numeric_limits<int32_t>::max());
const bool filter_txs = fuzzed_data_provider.ConsumeBool();
node.nServices = remote_services;
node.m_permissionFlags = permission_flags;
- node.nVersion = version;
- node.SetCommonVersion(version);
+ if (init_version) {
+ node.nVersion = version;
+ node.SetCommonVersion(std::min(version, PROTOCOL_VERSION));
+ }
if (node.m_tx_relay != nullptr) {
LOCK(node.m_tx_relay->cs_filter);
node.m_tx_relay->fRelayTxes = filter_txs;