Skip to content

Conversation

@rm-gh-8
Copy link
Contributor

@rm-gh-8 rm-gh-8 commented Nov 12, 2025

Backporting JDK-8292043: Incorrect decoding near EOF for stateful decoders like UTF-16. Fixes incorrect state handling with EOF in StreamDecoder. There's a reset() call to the decoder seeing the EOF before the last decode() operation to handle the state correctly. Removing the call should not affect other cases because reset() is issued down the execution.

Also adds a new test. Ran GHA Sanity Checks (passed) and new test (passed). Patch is clean.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8292043 needs maintainer approval

Issue

  • JDK-8292043: Incorrect decoding near EOF for stateful decoders like UTF-16 (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/4177/head:pull/4177
$ git checkout pull/4177

Update a local copy of the PR:
$ git checkout pull/4177
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/4177/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4177

View PR using the GUI difftool:
$ git pr show -t 4177

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/4177.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 12, 2025

👋 Welcome back rm-gh-8! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Nov 12, 2025

@rm-gh-8 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8292043: Incorrect decoding near EOF for stateful decoders like UTF-16

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 20 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport aa9b8f04bf74d5fa00f2b27895e7369abea3a930 8292043: Incorrect decoding near EOF for stateful decoders like UTF-16 Nov 12, 2025
@openjdk
Copy link

openjdk bot commented Nov 12, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Nov 12, 2025
@rm-gh-8 rm-gh-8 marked this pull request as ready for review November 13, 2025 16:19
@openjdk
Copy link

openjdk bot commented Nov 13, 2025

⚠️ @rm-gh-8 This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 13, 2025
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Nov 13, 2025

/approval request for backport of JDK-8292043: Incorrect decoding near EOF for stateful decoders like UTF-16.

Ran the updated and related tests on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:

(All Passed) - make test TEST=test/jdk/java/io/InputStreamReader

Results are attached.
linux-aarch64-specific-test.log
linux-x64-specific-test.log
macos-aarch64-specific-test.log
windows-x64-specific-test.log

@openjdk
Copy link

openjdk bot commented Nov 13, 2025

@rm-gh-8
8292043: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Nov 13, 2025
@mlbridge
Copy link

mlbridge bot commented Nov 13, 2025

Webrevs

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Nov 19, 2025
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Nov 19, 2025

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 19, 2025
@openjdk
Copy link

openjdk bot commented Nov 19, 2025

@rm-gh-8
Your change (at version 62bbf4c) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Nov 19, 2025

Going to push as commit 4272f8c.
Since your change was applied there have been 22 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Nov 19, 2025
@openjdk openjdk bot closed this Nov 19, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Nov 19, 2025
@openjdk
Copy link

openjdk bot commented Nov 19, 2025

@phohensee @rm-gh-8 Pushed as commit 4272f8c.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants