mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-20 21:31:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

exif: Fix handling of utf8 runes in nullString()

Browse Source
This commit is contained in:
Cameron Moore
2021-03-13 12:45:09 -06:00
committed by Bjørn Erik Pedersen
parent 0a2ab3f8fe
commit f6612d8bd8
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
resources/images/exif/exif.go
View File

@@ -226,17 +226,14 @@ func (e *exifWalker) Walk(f _exif.FieldName, tag *tiff.Tag) error {
func nullString(in []byte) string {
var rv bytes.Buffer
for _, b := range in {
if unicode.IsGraphic(rune(b)) {
rv.WriteByte(b)
for len(in) > 0 {
r, size := utf8.DecodeRune(in)
if unicode.IsGraphic(r) {
rv.WriteRune(r)
}
in = in[size:]
}
rvs := rv.String()
if utf8.ValidString(rvs) {
return rvs
}
return ""
return rv.String()
}
var tcodec *tmc.Codec