Skip to content
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

Jump to bottom

8331320: ClassFile API OutOfMemoryError with certain class files #19024

Closed
wants to merge 2 commits into from
Closed

8331320: ClassFile API OutOfMemoryError with certain class files #19024

wants to merge 2 commits into from

Conversation

asotona
Copy link
Member

@asotona asotona commented Apr 30, 2024 •
edited by openjdk bot
Loading

Class files with specifically corrupted tableswitch or lookupswitch instructions in the bytecode cause OutOfMemoryError while parsing with Class-File API.
This patch performs additional checks to avoid OOME and adds relevant tests.

Please review.

Thank you,
Adam

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-8331320: ClassFile API OutOfMemoryError with certain class files (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19024

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 30, 2024

👋 Welcome back asotona! 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 Apr 30, 2024 •
edited
Loading

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

8331320: ClassFile API OutOfMemoryError with certain class files

Reviewed-by: psandoz

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

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

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 30, 2024
@openjdk
Copy link

openjdk bot commented Apr 30, 2024

@asotona 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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Apr 30, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 30, 2024 •
edited
Loading

Webrevs

PaulSandoz
PaulSandoz reviewed Apr 30, 2024
View reviewed changes
src/java.base/share/classes/jdk/internal/classfile/impl/AbstractInstruction.java
@@ -314,6 +317,9 @@ static int size(CodeImpl code, int codeStart, int pos) {
int pad = ap - (pos + 1);
int low = code.classReader.readInt(ap + 4);
int high = code.classReader.readInt(ap + 8);
if (high < low || high - low > code.codeLength >> 2) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be its also an opportunity to reduce duplication e.g., replace line 316 with a call to afterPadding()

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BoundTableSwitchInstruction​::afterPadding() is an instance method, and BoundTableSwitchInstruction​::size(…) is a static method, so this would require further refactoring.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 2, 2024
@asotona
Copy link
Member Author

asotona commented May 2, 2024

/integrate

@openjdk
Copy link

openjdk bot commented May 2, 2024

Going to push as commit e2c0cfe.
Since your change was applied there have been 17 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 May 2, 2024
@openjdk openjdk bot closed this May 2, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 2, 2024
@openjdk
Copy link

openjdk bot commented May 2, 2024

@asotona Pushed as commit e2c0cfe.

💡 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
Reviewers

@ExE-Boss ExE-Boss ExE-Boss left review comments

@PaulSandoz PaulSandoz PaulSandoz approved these changes

Assignees
No one assigned
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@asotona @PaulSandoz @ExE-Boss