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

[naotoj]

Fixing 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.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

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

Reviewers

• Joe Wang (@JoeWang-Java - Reviewer) ⚠️ Review applies to 24977db2
• Alan Bateman (@AlanBateman - Reviewer)
• Lance Andersen (@LanceAndersen - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9945/head:pull/9945
$ git checkout pull/9945

Update a local copy of the PR:
$ git checkout pull/9945
$ git pull https://git.openjdk.org/jdk pull/9945/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9945

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9945.diff

[bridgekeeper]

👋 Welcome back naoto! 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]

@naotoj The following labels will be automatically applied to this pull request:

• core-libs
• nio

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 01: Full - Incremental (09846f00)
• 00: Full (24977db2)

[openjdk]

@naotoj 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

Reviewed-by: joehw, alanb, lancea

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 72 new commits pushed to the master branch:

• 79597f1: 8272702: Resolving URI relative path with no / may lead to incorrect toString
• 7b5f9ed: 8288966: Better handle very spiky promotion in G1
• 07c7977: 8290249: Vectorize signum on AArch64
• a3ec0bb: 8253413: [REDO] [REDO] G1 incorrectly limiting young gen size when using the reserve can result in repeated full gcs
• 27b0f77: 8292318: Memory corruption in remove_dumptime_info
• 9a65524: 8290300: Use standard String-joining tools where applicable
• f9004fe: 8292561: Make "ReplayCompiles" a diagnostic product switch
• 2fbb936: 8292691: Move CompilerConfig::is_xxx() inline functions out of compilerDefinitions.hpp
• 3601e30: 8290909: MemoryPoolMBean/isUsageThresholdExceeded tests failed with "isUsageThresholdExceeded() returned false, and is still false, while threshold = MMMMMMM and used peak = NNNNNNN"
• 37c0a13: 8292350: Use static methods for hashCode/toString primitives
• ... and 62 more: https://git.openjdk.org/jdk/compare/ea2c82e74f5580f396920f9e561cbec80c03f373...master

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[AlanBateman]

This will pass if either read fails, I think the test should be checking that the first call to read throws MalformedInputException.

Would it be feasible to add a second test where there are characters between the BOM and the truncated high surrogate? It would be possible to decode those characters before it fails at the end of the stream.

[naotoj]

Addressed both points.

[AlanBateman]

Thanks for the update, I think the test is much better now.

[naotoj]

/integrate

[openjdk]

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

• f95ee79: 8292566: Add reference to the java.nio.file package in java.nio package documentation
• 45c3e89: 8292316: Tests should not rely on specific JAR file names (jpackage)
• db77227: 8282684: Obsolete UseContainerCpuShares and PreferContainerQuotaForCPUCount flags
• 256b523: 8292381: java/net/httpclient/SpecialHeadersTest.java fails with "ERROR: Shutting down connection: HTTP/2 client stopped"
• e561933: 8292623: Reduce runtime of java.io microbenchmarks
• dcd7802: 8292708: Rename G1ParScanThreadState::flush to flush_stats
• 16593cf: 8292717: Clean up checking of testing requirements in configure
• c59f9b3: 8287828: Fix so that one can select jtreg test case by ID from make
• 476c484: 8292656: G1: Remove G1HotCardCache::_use_cache
• a17fce7: 6445283: ProgressMonitorInputStream not large file aware (>2GB)
• ... and 73 more: https://git.openjdk.org/jdk/compare/ea2c82e74f5580f396920f9e561cbec80c03f373...master

Your commit was automatically rebased without conflicts.

[openjdk]

@naotoj Pushed as commit aa9b8f0.

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