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

fix the line handling of UTF-16le #790

Merged
merged 1 commit into from
Oct 19, 2023
Merged

fix the line handling of UTF-16le #790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions check-log/lib/check-log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,15 @@ func (opts *logOpts) searchReader(ctx context.Context, rdr io.Reader) (warnNum,
readBytes += int64(len(lineBytes))

if opts.decoder != nil {
if opts.Encoding == "UTF-16le" {
// Separating UTF-16 little endian lines by byte 0x0a ("\n")
// leaves 0x00 at the beginning of second line onwards. Remove it.
if lineBytes[0] == 0x00 {
lineBytes = lineBytes[1:]
}
// Since it ends with 0x0a, use 0x0a 0x00 as UTF-16 little endian
lineBytes = append(lineBytes, 0x00)
}
lineBytes, err = opts.decoder.Bytes(lineBytes)
if err != nil {
break
Expand Down