Fix slice out of bounds error in mailer (#2479) (#2696)

7 years ago · 670562a9c5
parent ed07d8a308
commit 670562a9c5
1 changed files with 2 additions and 1 deletions
--- a/modules/mailer/mailer.go
+++ b/modules/mailer/mailer.go
@ -16,6 +16,7 @@ import (
 	"strings"
 	"time"

+	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"

@ -41,7 +42,7 @@ func NewMessageFrom(to []string, from, subject, body string) *Message {

 	plainBody, err := html2text.FromString(body)
 	if err != nil || setting.MailService.SendAsPlainText {
-		if strings.Contains(body[:100], "<html>") {
+		if strings.Contains(base.TruncateString(body, 100), "<html>") {
 			log.Warn("Mail contains HTML but configured to send as plain text.")
 		}
 		msg.SetBody("text/plain", plainBody)