mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 22:28:05 +01:00 
			
		
		
		
	Fix slice out of bounds error in mailer (#2479)
This commit is contained in:
		
							parent
							
								
									250f1236dc
								
							
						
					
					
						commit
						01d7189c2d
					
				| @ -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) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user