From 83ac5035c5676ee9bd75b79ecfb7778f0e9d599a Mon Sep 17 00:00:00 2001 From: Darwin4053 Date: Mon, 14 Jul 2025 17:36:42 +0530 Subject: [PATCH] Fix narrowing conversion on 32-bit systems by using uint64_t instead of size_t --- pdns/dnsdistdist/dnsdist-lua-configuration-items.cc | 4 ++-- pdns/dnsdistdist/dnsdist-lua.cc | 2 +- pdns/dnsdistdist/dnsdist-lua.hh | 2 +- pdns/dnsdistdist/test-dnsdistrules_cc.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pdns/dnsdistdist/dnsdist-lua-configuration-items.cc b/pdns/dnsdistdist/dnsdist-lua-configuration-items.cc index e482d4767a..dd6d63c194 100644 --- a/pdns/dnsdistdist/dnsdist-lua-configuration-items.cc +++ b/pdns/dnsdistdist/dnsdist-lua-configuration-items.cc @@ -38,7 +38,7 @@ struct BooleanConfigurationItems struct UnsignedIntegerConfigurationItems { const std::function mutator; - const size_t maximumValue{std::numeric_limits::max()}; + const uint64_t maximumValue{std::numeric_limits::max()}; }; struct StringConfigurationItems @@ -53,7 +53,7 @@ struct BooleanImmutableConfigurationItems struct UnsignedIntegerImmutableConfigurationItems { const std::function mutator; - const size_t maximumValue{std::numeric_limits::max()}; + const uint64_t maximumValue{std::numeric_limits::max()}; }; struct DoubleImmutableConfigurationItems diff --git a/pdns/dnsdistdist/dnsdist-lua.cc b/pdns/dnsdistdist/dnsdist-lua.cc index 3dc3592ef6..469747f66e 100644 --- a/pdns/dnsdistdist/dnsdist-lua.cc +++ b/pdns/dnsdistdist/dnsdist-lua.cc @@ -253,7 +253,7 @@ static void parseTLSConfig(TLSConfig& config, const std::string& context, boost: #endif // defined(HAVE_DNS_OVER_TLS) || defined(HAVE_DNS_OVER_HTTPS) -void checkParameterBound(const std::string& parameter, uint64_t value, size_t max) +void checkParameterBound(const std::string& parameter, uint64_t value, uint64_t max) { if (value > max) { throw std::runtime_error("The value (" + std::to_string(value) + ") passed to " + parameter + " is too large, the maximum is " + std::to_string(max)); diff --git a/pdns/dnsdistdist/dnsdist-lua.hh b/pdns/dnsdistdist/dnsdist-lua.hh index fc70190d72..73f81329c5 100644 --- a/pdns/dnsdistdist/dnsdist-lua.hh +++ b/pdns/dnsdistdist/dnsdist-lua.hh @@ -42,7 +42,7 @@ using luadnsrule_t = boost::variant, std::shared_p std::shared_ptr makeRule(const luadnsrule_t& var, const std::string& calledFrom); void parseRuleParams(boost::optional& params, boost::uuids::uuid& uuid, std::string& name, uint64_t& creationOrder); -void checkParameterBound(const std::string& parameter, uint64_t value, size_t max = std::numeric_limits::max()); +void checkParameterBound(const std::string& parameter, uint64_t value, uint64_t max = std::numeric_limits::max()); void setupLua(LuaContext& luaCtx, bool client, bool configCheck, const std::string& config); void setupLuaActions(LuaContext& luaCtx); diff --git a/pdns/dnsdistdist/test-dnsdistrules_cc.cc b/pdns/dnsdistdist/test-dnsdistrules_cc.cc index b73074feb7..327c13e461 100644 --- a/pdns/dnsdistdist/test-dnsdistrules_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistrules_cc.cc @@ -12,7 +12,7 @@ #include "dnsdist-rules.hh" #include "dnsdist-rules-factory.hh" -void checkParameterBound(const std::string& parameter, uint64_t value, size_t max) +void checkParameterBound(const std::string& parameter, uint64_t value, uint64_t max) { if (value > max) { throw std::runtime_error("The value passed to " + parameter + " is too large, the maximum is " + std::to_string(max)); -- 2.47.2