Add missing EOF checks in MultiDelimiterInterpolatorFilterReaderLineEnding.read()#348
Open
elharo wants to merge 2 commits into
Open
Add missing EOF checks in MultiDelimiterInterpolatorFilterReaderLineEnding.read()#348elharo wants to merge 2 commits into
elharo wants to merge 2 commits into
Conversation
…nding.read() The escape-detection loop (line 223) and delimiter-detection loop (line 246) were missing ch == -1 checks. When EOF is reached mid-token, (char) -1 produces 0xFFFF which gets appended to the key StringBuilder as garbage. The equivalent single-delimiter class InterpolatorFilterReaderLineEnding already has these checks.
There was a problem hiding this comment.
Pull request overview
This pull request fixes EOF handling in MultiDelimiterInterpolatorFilterReaderLineEnding.read() so that reaching end-of-stream while matching an escape string or delimiter begin token no longer results in 0xFFFF being appended to the output.
Changes:
- Add explicit
ch == -1checks in the escape-string and begin-token matching loops. - Prevent appending
(char) -1to the output buffer during escape handling. - Add a regression test covering EOF immediately after an escape character.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java |
Adds EOF guards during token detection and avoids appending (char)-1 when EOF occurs while processing an escape sequence. |
src/test/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEndingTest.java |
Adds a regression test ensuring EOF after an escape char does not emit a garbage 0xFFFF character. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The escape-detection loop (line 223) and delimiter-detection loop (line 246)
were missing ch == -1 checks. When EOF is reached mid-token, (char) -1
produces 0xFFFF which gets appended to the key StringBuilder as garbage.
The equivalent single-delimiter class InterpolatorFilterReaderLineEnding
already has these checks.
fixes #349