Prevent segfault with empty allow-from-file and allow-from options

Always return a valid NetmaskGroup from parseACL()

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index cbf4c85a8a342f1044fe6aabbe56c49bce116114..6fef73efbb62a8b5ea4b64f981e86cfe76e82b8e 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -958,8 +958,6 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
       result->addMask(line);
     }
     g_log << Logger::Info << "Done parsing " << result->size() << " " << aclSetting << " ranges from file '" << ::arg()[aclFile] << "' - overriding '" << aclSetting << "' setting" << endl;
-
-    return result;
   }
   else if (!::arg()[aclSetting].empty()) {
     vector<string> ips;
@@ -973,11 +971,9 @@ static std::shared_ptr<NetmaskGroup> parseACL(const std::string& aclFile, const
       g_log << Logger::Info << *i;
     }
     g_log << Logger::Info << endl;
-
-    return result;
   }
 
-  return nullptr;
+  return result;
 }
 
 static void* pleaseSupplantAllowFrom(std::shared_ptr<NetmaskGroup> ng)