8292327: java.io.EOFException in InflaterInputStream after JDK-8281962

[simonis]

The problem is that after JDK-8281962 we call fill() unconditionally (and before calling Inflater::inflate()) in InflaterInputStream::read() if Inflater::needsInput() is true. This misses the case where the native inflater has consumed all its input (i.e. Inflater::needsInput() returns true) but hasn't managed to write all the inflated data into the output buffer (e.g. because it was to small). In rare cases, there might be now more input available (i.e. calling InflaterInputStream::fill() will throw an EOFException) but we still have to call Inflater::inflate() to consume the buffered output from the underlying native inflater until inflation stops.

The documentation of the inflate() method in zlib.h mentions this explicitely:

"If inflate() returns Z_OK and with zero avail_out, it must be called again after making room in the output buffer because there might be more output pending."

---

Progress

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

Issue

• JDK-8292327: java.io.EOFException in InflaterInputStream after JDK-8281962

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9881

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

Using diff file

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

[bridgekeeper[bot]]

:wave: Welcome back simonis! 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[bot]]

@simonis The following label will be automatically applied to this pull request:

• core-libs

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

[mlbridge[bot]]

Webrevs

• 02: Full - Incremental (35d80f6c)
• 01: Full - Incremental (3bbfacf1)
• 00: Full (74eb08c2)

[AlanBateman]

The problem is that after JDK-8281962

In the description, this should link to JDK-8281962 rather than (JDK-8292327). Just pointing out as someone looking at this PR in the future might get confused as to which issue caused the regression.

[simonis]

I've updated the link in the description (sorry, copy-paste error) and opened a JBS issue for fill().

What else is needed to push this to HEAD?

And what do we want to do about JDK 19? Have you read my last comment in the JBS issue`?

[AlanBateman]

And what do we want to do about JDK 19?

It's not a P1 so I don't think it's a change for the RC builds. It is a regression in 19 so we will need to create a RN-KnownIssue release note (I will do that).

I agree with Lance's suggestion to revert JDK-8281962 in JDK 19u. It might be that in the future that you want to re-do the original change for a future 19 update but I think we should give the changes in the main line time to bake.

Separately, we need a high priority issue to create tests for this area. We also need to fix the specification of the fill method as we've been discussing here.

[openjdk[bot]]

@simonis 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:

8292327: java.io.EOFException in InflaterInputStream after JDK-8281962

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

• e44e3f0c1976a513c6637545f49f49de84cbac02: 8289106: Add model of class file versions to core reflection
• c3d3662e52de434adb267485982fbf8541bdc0c8: 8292313: 2 runtime/cds/appcds tests fail after JDK-8284313
• 3e122419b2979235f57c0dd549ca63647ea73753: 8290775: Some doc errors in DerOutputStream.java
• ec53fba03933446024028555b87c6023895a5dc6: 8292361: Build failure on PPC64 BE after JDK-8290840
• 4cc6cb9d9ddbcc540baac7b81398f2af83f93340: 8290041: ModuleDescriptor.hashCode is inconsistent
• d1edda8ff52e172a85d102d7d5062b9cc401beea: 8292338: aarch64: Use cbnz instruction in gen_continuation_enter when possible
• 21f4eb2233a95be44a5db59b7791cd952ddbd56e: 6521141: DebugGraphics NPE @ setFont();
• 6e6ae596d6bd73909b90911e01fbd0c16f6335e1: 8292286: Convert PlaceholderTable to ResourceHashtable
• ea2c82e74f5580f396920f9e561cbec80c03f373: 8291949: Unexpected extending of SupportedGroups
• b5707b0376660cd8763e46d525ba614b08a59d7b: 8292196: Reduce runtime of java.util.regex microbenchmarks
• ... and 4 more: https://git.openjdk.org/jdk/compare/695bb3939135394a4627d1c41cfc30d11b19bf48...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.

[simonis]

Thanks for the review @AlanBateman.

I'll wait with the integration until tomorrow to also give the colleagues in the US time zone a chance to look at the PR.

[simonis]

Hi @LanceAndersen,

Thanks for the review. I can't run Mach 1-3 because it's Oracle internal but I've run the corresponding JCK tests.

I think more and better tests should be done as a follow-up task as suggested by Alan.

[simonis]

/integrate

[openjdk[bot]]

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

• e61f6fc3940720f6ebc3ef360e25b880729cfa5a: 8292362: java/lang/Thread/jni/AttachCurrentThread/AttachTest.java#id1 failed on some platforms
• 0bfb12162f6035559a114176115b91aff6df3b64: 8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"
• 1d9c2f7a6e3e897721ef99af8f383a07148b7c4e: 8292279: (fs) Use try-with-resources to release NativeBuffer
• a25e1dc53cecc5dd917ac0f76fd86ef1f074adba: 8292285: C2: remove unreachable block after NeverBranch-to-Goto conversion
• 1ef4e484889c77cccadea44025924b2d010ba2cc: 8273860: Javadoc Deprecated API list should not use italic font for description column
• 0cc66aeae8cbf2d01be5f5ba38e46f1deb9ec7a6: 8285790: AArch64: Merge C2 NEON and SVE matching rules
• da477b13661b39e1f48b674f7fd9ea1d26521fc3: 8292509: ProblemList java/lang/invoke/lambda/LogGeneratedClassesTest.java on windows
• 01b87ba8e2c48ad29c1f4771973ebbe938967448: 8289616: Drop use of Thread.stop in AppContext
• e44e3f0c1976a513c6637545f49f49de84cbac02: 8289106: Add model of class file versions to core reflection
• c3d3662e52de434adb267485982fbf8541bdc0c8: 8292313: 2 runtime/cds/appcds tests fail after JDK-8284313
• ... and 12 more: https://git.openjdk.org/jdk/compare/695bb3939135394a4627d1c41cfc30d11b19bf48...master

Your commit was automatically rebased without conflicts.

[openjdk[bot]]

@simonis Pushed as commit 802ef38060080254e55621e4c64fa31a6c0b7b18.

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