Skip to content

fix: Actually read utf16 #75

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

Merged
merged 1 commit into from
Apr 4, 2023
Merged

fix: Actually read utf16 #75

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
30 changes: 18 additions & 12 deletions src/blame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,21 +223,27 @@ fn convert_file(buffer: &[u8], path: &std::path::Path) -> anyhow::Result<String>
String::from_utf8_lossy(buffer).into_owned()
},
content_inspector::ContentType::UTF_16LE => {
let mut decoded = String::new();
let (r, _) = encoding_rs::UTF_16LE.new_decoder_with_bom_removal().decode_to_string_without_replacement(buffer, &mut decoded, true);
match r {
encoding_rs::DecoderResult::InputEmpty => {},
_ => anyhow::bail!("Could not decode UTF-16 in {}", path.display()),
}
// Despite accepting a `String`, decode_to_string_without_replacement` doesn't allocate
// so to avoid `OutputFull` loops, we're going to assume any UTF-16 content can fit in
// a buffer twice its size
let mut decoded = String::with_capacity(buffer.len() * 2);
let (r, written) = encoding_rs::UTF_16LE.new_decoder_with_bom_removal().decode_to_string_without_replacement(buffer, &mut decoded, true);
let decoded = match r {
encoding_rs::DecoderResult::InputEmpty => decoded,
_ => anyhow::bail!("invalid UTF-16LE encoding at byte {} in {}", written, path.display()),
};
decoded
}
content_inspector::ContentType::UTF_16BE => {
let mut decoded = String::new();
let (r, _) = encoding_rs::UTF_16BE.new_decoder_with_bom_removal().decode_to_string_without_replacement(buffer, &mut decoded, true);
match r {
encoding_rs::DecoderResult::InputEmpty => {},
_ => anyhow::bail!("Could not decode UTF-16 in {}", path.display()),
}
// Despite accepting a `String`, decode_to_string_without_replacement` doesn't allocate
// so to avoid `OutputFull` loops, we're going to assume any UTF-16 content can fit in
// a buffer twice its size
let mut decoded = String::with_capacity(buffer.len() * 2);
let (r, written) = encoding_rs::UTF_16BE.new_decoder_with_bom_removal().decode_to_string_without_replacement(buffer, &mut decoded, true);
let decoded = match r {
encoding_rs::DecoderResult::InputEmpty => decoded,
_ => anyhow::bail!("invalid UTF-16BE encoding at byte {} in {}", written, path.display()),
};
decoded
},
};
Expand Down