Skip to content

fix: guard against nil before calling string #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 19, 2024
Merged

fix: guard against nil before calling string #241

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions internal/dns/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ func startListener(server *dns.Server) {
}

func handleQuery(w dns.ResponseWriter, r *dns.Msg) {
if r.Question == nil {
return
}
cfg := config.GetConfig()
m := new(dns.Msg)

Expand Down Expand Up @@ -165,6 +168,18 @@ func handleQuery(w dns.ResponseWriter, r *dns.Msg) {
if cfg.Dns.RecursionEnabled {
// Pick random nameserver for domain
tmpNameserver := randomNameserverAddress(nameservers)
if tmpNameserver == nil {
m.SetRcode(r, dns.RcodeServerFailure)
if err := w.WriteMsg(m); err != nil {
slog.Error(
"unable to get nameserver",
)
}
slog.Error(
"unable to get nameserver",
)
return
}
// Query the random domain nameserver we picked above
resp, err := doQuery(r, tmpNameserver.String(), true)
if err != nil {
Expand Down Expand Up @@ -469,9 +484,13 @@ func getAddressForNameFromResponse(msg *dns.Msg, recordName string) string {
}
switch v := retRR.(type) {
case *dns.A:
return v.A.String()
if v.A != nil {
return v.A.String()
}
case *dns.AAAA:
return v.AAAA.String()
if v.AAAA != nil {
return v.AAAA.String()
}
}
return ""
}
Expand Down