Skip to content

Fix TOML parse failure when number token hits buffer edge #95

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 2 commits into from
Nov 23, 2022
Merged

Fix TOML parse failure when number token hits buffer edge #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2714aa0
Fix TOML parse failure when number token hits buffer edge
yawkat Nov 22, 2022
5d2e274
Update toml/src/test/java/io/micronaut/toml/ParserTest.java
yawkat Nov 23, 2022
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
5 changes: 5 additions & 0 deletions toml/src/main/java/io/micronaut/toml/Parser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,12 @@ private JsonNode parseInt(int nextState) throws IOException {
}
}

JsonNode v = parseInt0(buffer, start, length);
pollExpected(TomlToken.INTEGER, nextState);
return v;
}

private JsonNode parseInt0(char[] buffer, int start, int length) throws TomlStreamReadException {
if (length > 2) {
char baseChar = buffer[start + 1];
if (baseChar == 'x' || baseChar == 'o' || baseChar == 'b') {
Expand Down
10 changes: 10 additions & 0 deletions toml/src/test/java/io/micronaut/toml/ParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,4 +1016,14 @@ public void unknownEscape() throws IOException {
Assertions.assertThrows(TomlStreamReadException.class, () -> toml("foo = \"\\k\"")).getOriginalMessage(),
Matchers.containsString("Unknown escape sequence"));
}

@Test
// https://github.com/micronaut-projects/micronaut-toml/pull/95
void longInput() {
Assertions.assertDoesNotThrow(() -> toml(
"foo = \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"\n" +
"bar = 678\n" +
"baz = \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\""
));
}
}