From 0d78dcc1fe5d98741f05d82a563b2dddd78a1141 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 7 Oct 2020 18:51:42 +0200 Subject: [PATCH] Fix 2 out of ranges panic --- services/email.go | 4 +++- utils/dns.go | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/email.go b/services/email.go index e1efc55..f1d34fe 100644 --- a/services/email.go +++ b/services/email.go @@ -126,7 +126,9 @@ func (s *EMail) GenComment(origin string) string { nbLabel := len(labels) var dn string - if len(labels[nbLabel-2]) < 4 { + if nbLabel <= 2 { + dn = mx.Target + } else if len(labels[nbLabel-2]) < 4 { dn = strings.Join(labels[nbLabel-3:], ".") + "." } else { dn = strings.Join(labels[nbLabel-2:], ".") + "." diff --git a/utils/dns.go b/utils/dns.go index 7fd5bbf..b6d4184 100644 --- a/utils/dns.go +++ b/utils/dns.go @@ -89,7 +89,7 @@ func DomainJoin(domains ...string) (ret string) { ret += "." + d } - if ret[len(ret)-1] == '.' { + if len(ret) > 0 && ret[len(ret)-1] == '.' { break } }