peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lunny Xiao 2017-10-14 03:59:03 +08:00 committed by Lauris BH
parent ed07d8a308
commit 670562a9c5
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"
"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)