Skip to content

Fix IndexOutOfBoundsException in TOML parser #412

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
cowtowncoder merged 1 commit into from
Apr 11, 2023
Merged

Fix IndexOutOfBoundsException in TOML parser #412

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
7 changes: 5 additions & 2 deletions toml/src/main/jflex/skeleton-toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,11 @@

/* first: make room (if you can) */
if (zzStartRead > 0) {
zzEndRead += zzFinalHighSurrogate;
zzFinalHighSurrogate = 0;
// JACKSON: check bounds before modifying zzEndRead (jackson-dataformats-text#411)
if (zzEndRead < zzBuffer.length - zzFinalHighSurrogate) {
zzEndRead += zzFinalHighSurrogate;
zzFinalHighSurrogate = 0;
}
System.arraycopy(zzBuffer, zzStartRead,
zzBuffer, 0,
zzEndRead - zzStartRead);
Expand Down
2 changes: 1 addition & 1 deletion toml/src/test/java/com/fasterxml/jackson/dataformat/toml/failing/FuzzTomlRead57237Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void testArrayCopy57237() throws Exception
Assert.fail("Should not pass");
} catch (IOException e) {
// Possibly not what we should get; tweak once working
verifyException(e, "EOF in wrong state");
verifyException(e, "Premature end of file");
}
}
}
Expand Down