dnsdist: Make sure that setConsistentHashingBalancingFactor() >= 0

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index 251a071f598721711ccc48d34b102bb36bed53a7..4976e3a667921e157c1301ccba63b7b791083f14 100644 (file)
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -1593,7 +1593,14 @@ void setupLuaConfig(bool client)
 
   g_lua.writeFunction("setConsistentHashingBalancingFactor", [](double factor) {
       setLuaSideEffect();
-      g_consistentHashBalancingFactor = factor;
+      if (factor >= 0) {
+        g_consistentHashBalancingFactor = factor;
+      }
+      else {
+        errlog("Invalid value passed to setConsistentHashingBalancingFactor()!");
+        g_outputBuffer="Invalid value passed to setConsistentHashingBalancingFactor()!\n";
+        return;
+      }
     });
 
   g_lua.writeFunction("setRingBuffersSize", [](size_t capacity, boost::optional<size_t> numberOfShards) {

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 4c3bb2cc529fb1210d4c72986a1a5534a7e66164..71066f1d0c7be9f8bd95a1a37029e895a6527d20 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -896,7 +896,7 @@ shared_ptr<DownstreamState> chashed(const NumberedServerVector& servers, const D
   shared_ptr<DownstreamState> ret = nullptr, first = nullptr;
 
   double targetLoad = std::numeric_limits<double>::max();
-  if (g_consistentHashBalancingFactor != 0) {
+  if (g_consistentHashBalancingFactor > 0) {
     /* we start with one, representing the query we are currently handling */
     double currentLoad = 1;
     for (const auto& pair : servers) {