From 0f06cd4cdec8b7f7f7edb082afd94547a7a6d08a Mon Sep 17 00:00:00 2001
From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 26 Feb 2016 11:17:29 +0100
Subject: [PATCH] dnsdist: Fix crash when calling rmServer() with an invalid
 index

Fix #3460.
---
 pdns/dnsdist-lua.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pdns/dnsdist-lua.cc b/pdns/dnsdist-lua.cc
index d114634787..fdde7611be 100644
--- a/pdns/dnsdist-lua.cc
+++ b/pdns/dnsdist-lua.cc
@@ -394,12 +394,14 @@ vector<std::function<void(void)>> setupLua(bool client, const std::string& confi
                         }
                         else {
                           int idx = boost::get<int>(var);
-                          server = states[idx];
+                          server = states.at(idx);
                         }
                         auto localPools = g_pools.getCopy();
                         for (const string& poolName : server->pools) {
                           removeServerFromPool(localPools, poolName, server);
                         }
+                        /* the server might also be in the default pool */
+                        removeServerFromPool(localPools, "", server);
                         g_pools.setState(localPools);
                         states.erase(remove(states.begin(), states.end(), server), states.end());
                         g_dstates.setState(states);
-- 
2.47.2