[pull] master from PowerDNS:master

docs/backends/lmdb.rst

@@ -122,8 +122,9 @@ Defaults to 100 on 32 bit systems, and 16000 on 64 bit systems.
 
   .. versionchanged:: 5.1.0
 
-From version 5.1.0 onwards, this settings only applies to the main database
-file; shards use :ref:`settings-lmdb-shards-map-size` instead.
+From version 5.1.0 onwards, the size of the main database and the
+size of the shard databases can be set independently.
+In order to set a different size for the shard databases, use :ref:`settings-lmdb-shards-map-size`.
 
 .. _settings-lmdb-shards-map-size:
 

pdns/dnsdistdist/dnsdist-lbpolicies.hh

@@ -24,6 +24,7 @@
 #include <memory>
 #include <optional>
 #include <vector>
+#include <stdexcept>
 
 struct dnsdist_ffi_servers_list_t;
 struct dnsdist_ffi_server_t;
@@ -87,6 +88,9 @@ public:
 
     DownstreamState* operator->() const
     {
+      if (!d_selected.has_value()) {
+        throw std::runtime_error("Trying to access an invalid SelectedBackend");
+      }
       return (*d_backends)[*d_selected].second.get();
     }
 

pdns/dnsdistdist/dnsdist.cc

@@ -1498,7 +1498,7 @@ static ServerPolicy::SelectedBackend selectBackendForOutgoingQuery(DNSQuestion&
   const auto& servers = serverPool.getServers();
   auto selectedBackend = policy.getSelectedBackend(servers, dnsQuestion);
 
-  if (closer) {
+  if (closer && selectedBackend) {
     closer->setAttribute("backend.name", AnyValue{selectedBackend->getNameWithAddr()});
     closer->setAttribute("backend.id", AnyValue{boost::uuids::to_string(selectedBackend->getID())});
   }