Skip to content

Don't crash if text file contains invalid utf8 #80

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
Jan 14, 2021
+4 −2
Merged

Don't crash if text file contains invalid utf8 #80

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
6 changes: 4 additions & 2 deletions tmc-langs-framework/src/meta_syntax.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,13 @@ impl<B: BufRead> Iterator for MetaSyntaxParser<B> {
type Item = Result<MetaString, TmcError>;

fn next(&mut self) -> Option<Self::Item> {
let mut s = String::new();
match self.reader.read_line(&mut s) {
let mut raw_string_buffer: Vec<u8> = Vec::new();

match self.reader.read_until(b'\n', &mut raw_string_buffer) {
// read 0 bytes = reader empty = iterator empty
Ok(0) => None,
Ok(_) => {
let mut s = String::from_utf8_lossy(&raw_string_buffer).to_string();
// check line with each meta syntax
for meta_syntax in self.meta_syntaxes {
// check for stub
Expand Down