Merge pull request #2540 from SamWhited/resolver_panic

Fixes a panic in the DNS resolver
This commit is contained in:
Arko Dasgupta 2020-03-18 11:26:00 -07:00 committed by GitHub
commit 2e64325fee

View file

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