Merge: - dnsforward: don't use dnsfilter object after it's closed (ad…

…ditional check) * commit 'a370cd0bf035213ea7d09e1e577a4612934a8c5a': - dnsforward: don't use dnsfilter object after it's closed (additional check)
AdguardTeam · Aug 22, 2019 · bde5936 · bde5936
2 parents e6bd2a1 + a370cd0
commit bde5936
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go
@@ -522,7 +522,7 @@ func (s *Server) filterDNSRequest(d *proxy.DNSContext) (*dnsfilter.Result, error
 
 	dnsFilter := s.dnsFilter
 
-	if !s.conf.ProtectionEnabled {
+	if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
 		return &dnsfilter.Result{}, nil
 	}