Browse Source

Merge pull request #2540 from SamWhited/resolver_panic

Fixes a panic in the DNS resolver
Arko Dasgupta 5 years ago
parent
commit
2e64325fee
1 changed files with 1 additions and 1 deletions
  1. 1 1
      libnetwork/resolver.go

+ 1 - 1
libnetwork/resolver.go

@@ -484,7 +484,7 @@ func (r *resolver) ServeDNS(w dns.ResponseWriter, query *dns.Msg) {
 			resp, err = co.ReadMsg()
 			resp, err = co.ReadMsg()
 			// Truncated DNS replies should be sent to the client so that the
 			// Truncated DNS replies should be sent to the client so that the
 			// client can retry over TCP
 			// client can retry over TCP
-			if err != nil && !resp.Truncated {
+			if err != nil && (resp != nil && !resp.Truncated) {
 				r.forwardQueryEnd()
 				r.forwardQueryEnd()
 				logrus.Debugf("[resolver] read from DNS server failed, %s", err)
 				logrus.Debugf("[resolver] read from DNS server failed, %s", err)
 				continue
 				continue