MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-19 04:21:06 +00:00
Code Issues Releases Wiki Activity

Handle UTF-16 encoding errors with replacement characters

Browse Source
This commit is contained in:
sharkdp 2019-02-10 09:20:02 +01:00 committed by David Peter
parent fa3244f7c1
commit 9e11d66979
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/printer.rs
View File

@ -261,11 +261,11 @@ impl<'a> Printer for InteractivePrinter<'a> {
return Ok(()); return Ok(());
} }
ContentType::UTF_16LE => UTF_16LE ContentType::UTF_16LE => UTF_16LE
.decode(&line_buffer, DecoderTrap::Strict) .decode(&line_buffer, DecoderTrap::Replace)
.unwrap_or("Invalid UTF-16LE".into()), .map_err(|_| "Invalid UTF-16LE")?,
ContentType::UTF_16BE => UTF_16BE ContentType::UTF_16BE => UTF_16BE
.decode(&line_buffer, DecoderTrap::Strict) .decode(&line_buffer, DecoderTrap::Replace)
.unwrap_or("Invalid UTF-16BE".into()), .map_err(|_| "Invalid UTF-16BE")?,
_ => String::from_utf8_lossy(&line_buffer).to_string(), _ => String::from_utf8_lossy(&line_buffer).to_string(),
}; };