Merge: - dnsforward: don't use dnsfilter object after it's closed (additional check)

* commit 'a370cd0bf035213ea7d09e1e577a4612934a8c5a': - dnsforward: don't use dnsfilter object after it's closed (additional check)
2019-08-22 12:05:55 +03:00 · 2019-08-22 12:05:55 +03:00 · bde59364c6
parent e6bd2a101d a370cd0bf0
commit bde59364c6
1 changed files with 1 additions and 1 deletions
--- 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
 	}