aboutsummaryrefslogtreecommitdiff
path: root/internal/reader/xml/decoder.go
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <f@miniflux.net> 2023-12-01 16:27:18 -0800
committerGravatar Frédéric Guillot <f@miniflux.net> 2023-12-01 16:52:03 -0800
commitd0f99cee1af46be932b3b6b7e343a511eaa829a1 (patch)
treec9af07ac29e666adef0e5ff68d01f362bfaead61 /internal/reader/xml/decoder.go
parentf8b40085cdc4af0ce8f36c54b5e16b700acedf65 (diff)
downloadv2-d0f99cee1af46be932b3b6b7e343a511eaa829a1.tar.gz
v2-d0f99cee1af46be932b3b6b7e343a511eaa829a1.tar.zst
v2-d0f99cee1af46be932b3b6b7e343a511eaa829a1.zip
Regression: ensure all HTML documents are encoded in UTF-8
Fixes #2196
Diffstat (limited to 'internal/reader/xml/decoder.go')
-rw-r--r--internal/reader/xml/decoder.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/reader/xml/decoder.go b/internal/reader/xml/decoder.go
index b8af6330..3b46cf78 100644
--- a/internal/reader/xml/decoder.go
+++ b/internal/reader/xml/decoder.go
@@ -13,8 +13,8 @@ import (
"miniflux.app/v2/internal/reader/encoding"
)
-// NewDecoder returns a XML decoder that filters illegal characters.
-func NewDecoder(data io.Reader) *xml.Decoder {
+// NewXMLDecoder returns a XML decoder that filters illegal characters.
+func NewXMLDecoder(data io.Reader) *xml.Decoder {
var decoder *xml.Decoder
buffer, _ := io.ReadAll(data)
enc := procInst("encoding", string(buffer))
@@ -36,7 +36,7 @@ func NewDecoder(data io.Reader) *xml.Decoder {
}
rawData, err := io.ReadAll(utf8Reader)
if err != nil {
- return nil, fmt.Errorf("Unable to read data: %q", err)
+ return nil, fmt.Errorf("encoding: unable to read data: %w", err)
}
filteredBytes := bytes.Map(filterValidXMLChar, rawData)
return bytes.NewReader(filteredBytes), nil