Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2026-02-11 11:38:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: always check charset before utf8 validity

Browse Source
This commit is contained in:
James Houlahan
2020-08-25 15:14:35 +02:00
parent b5d3737a7e
commit ef2ace0afe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/message/parser/part.go
View File

@ -65,10 +65,6 @@ func (p *Part) AddChild(child *Part) {
} }
func (p *Part) ConvertToUTF8() error { func (p *Part) ConvertToUTF8() error {
if utf8.Valid(p.Body) {
return nil
}
t, params, err := p.Header.ContentType() t, params, err := p.Header.ContentType()
if err != nil { if err != nil {
return err return err
@ -99,6 +95,10 @@ func selectSuitableDecoder(p *Part, t string, params map[string]string) *encodin
} }
} }
if utf8.Valid(p.Body) {
return encoding.Nop.NewDecoder()
}
encoding, _, _ := charset.DetermineEncoding(p.Body, t) encoding, _, _ := charset.DetermineEncoding(p.Body, t)
return encoding.NewDecoder() return encoding.NewDecoder()