Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Detect truncated utf-8 characters at the end of content as still representing utf-8 #19773

Merged
merged 6 commits into from
May 21, 2022
Merged

Detect truncated utf-8 characters at the end of content as still representing utf-8 #19773

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b564612
Detect truncated utf-8 characters at the end of content as still repr…
zeripath May 21, 2022
72a0a45
Add testcase
zeripath May 21, 2022
928f95d
Merge branch 'main' into fix-19743-improve-encoding-detection
zeripath May 21, 2022
ec56d54
as per lunny
zeripath May 21, 2022
aaaedea
Merge branch 'main' into fix-19743-improve-encoding-detection
zeripath May 21, 2022
1169025
Merge remote-tracking branch 'zeripath/fix-19743-improve-encoding-det…
zeripath May 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion modules/charset/charset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,26 @@ func RemoveBOMIfPresent(content []byte) []byte {

// DetectEncoding detect the encoding of content
func DetectEncoding(content []byte) (string, error) {
if utf8.Valid(content) {
// First we check if the content represents valid utf8 content excepting a truncated character at the end.

// Now we could decode all the runes in turn but this is not necessarily the cheapest thing to do
// instead we walk backwards from the end to trim off a the incomplete character
toValidate := content
end := len(toValidate) - 1

if end < 0 {
// no-op
} else if toValidate[end]>>5 == 0b110 {
// Incomplete 1 byte extension e.g. © <c2><a9> which has been truncated to <c2>
toValidate = toValidate[:end]
} else if end > 0 && toValidate[end]>>6 == 0b10 && toValidate[end-1]>>4 == 0b1110 {
// Incomplete 2 byte extension e.g. ⛔ <e2><9b><94> which has been truncated to <e2><9b>
toValidate = toValidate[:end-1]
} else if end > 1 && toValidate[end]>>6 == 0b10 && toValidate[end-1]>>6 == 0b10 && toValidate[end-2]>>3 == 0b11110 {
// Incomplete 3 byte extension e.g. 💩 <f0><9f><92><a9> which has been truncated to <f0><9f><92>
toValidate = toValidate[:end-2]
}
if utf8.Valid(toValidate) {
log.Debug("Detected encoding: utf-8 (fast)")
return "UTF-8", nil
}
Expand Down