Skip to content

Fix panic with invalid unicode query #645

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
LegNeato merged 1 commit into from
May 1, 2020
Merged

Fix panic with invalid unicode query #645

Show file tree
Hide file tree
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: 5 additions & 1 deletion juniper/src/parser/lexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,11 @@ impl<'a> Lexer<'a> {
len += 1;
}

let escape = &self.source[start_idx..=end_idx];
// Make sure we are on a valid char boundary.
let escape = &self
.source
.get(start_idx..=end_idx)
.ok_or_else(|| Spanning::zero_width(&self.position, LexerError::UnterminatedString))?;

if len != 4 {
return Err(Spanning::zero_width(
Expand Down
9 changes: 9 additions & 0 deletions juniper/src/parser/tests/lexer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,15 @@ fn string_errors() {
LexerError::UnterminatedString
)
);

// Found by fuzzing.
assert_eq!(
tokenize_error(r#""\uɠ^A"#),
Spanning::zero_width(
&SourcePosition::new(5, 0, 5),
LexerError::UnterminatedString
)
);
}

#[test]
Expand Down