From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 22 Apr 2022 08:37:56 +0000 (+0200)
Subject: rec: Backport of 11496 to rec-4.6.x: Prevent segfault with empty allow-from-file... 
X-Git-Tag: rec-4.6.3~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11569%2Fhead;p=thirdparty%2Fpdns.git

rec: Backport of 11496 to rec-4.6.x: Prevent segfault with empty allow-from-file and allow-from options
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 1700a9fde7..ea455bb482 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4775,8 +4775,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;
@@ -4790,11 +4788,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;
 }
 
 void parseACLs()