Skip to content

Fix memory leak while parsing improperly terminated inherit-expressions #31

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
Sep 23, 2021
Merged

Fix memory leak while parsing improperly terminated inherit-expressions #31

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
3 changes: 3 additions & 0 deletions src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,9 @@ where

while self.peek() != Some(TOKEN_SEMICOLON) {
self.parse_val();
if self.errors.last().map_or(false, |x| *x == ParseError::UnexpectedEOF) {
break;
}
}

self.expect(TOKEN_SEMICOLON);
Expand Down
13 changes: 13 additions & 0 deletions test_data/parser/inherit/2.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error: unexpected end of file
error: unexpected end of file, wanted any of [TOKEN_SEMICOLON]
error: unexpected end of file
error: unexpected end of file
NODE_ROOT 0..13 {
NODE_LET_IN 0..13 {
TOKEN_LET("let") 0..3
TOKEN_WHITESPACE("\n ") 3..6
NODE_INHERIT 6..13 {
TOKEN_INHERIT("inherit") 6..13
}
}
}
2 changes: 2 additions & 0 deletions test_data/parser/inherit/2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
let
inherit