Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

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

Browse source
This commit is contained in:
Jonas Östanbäck 2017-09-11 08:33:28 +02:00 committed by Lunny Xiao
parent 250f1236dc
commit 01d7189c2d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/mailer/mailer.go
View file

@ -16,6 +16,7 @@ import (
"strings" "strings"
"time" "time"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
@ -41,7 +42,7 @@ func NewMessageFrom(to []string, from, subject, body string) *Message {
plainBody, err := html2text.FromString(body) plainBody, err := html2text.FromString(body)
if err != nil || setting.MailService.SendAsPlainText { 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.") log.Warn("Mail contains HTML but configured to send as plain text.")
} }
msg.SetBody("text/plain", plainBody) msg.SetBody("text/plain", plainBody)