Skip to content

Conversation

@franferrax
Copy link
Contributor

@franferrax franferrax commented Dec 18, 2025

Hi, this is an almost clean backport of openjdk/jdk17u-dev#3901.

The only differences are in context (deleted and surrounding code) due to 11u missing JDK-8211300: Convert C-style array declarations in JDK client code.

NOTE: as part of this work, I found some issues with the original patch (see JDK-8373727), so an additional backport of that fix will be needed too.

Testing

The GitHub Actions testing run (tier1 on various platforms) has passed.

In addition, the new test/jdk/java/awt/image/XBMDecoder/XBMDecoderTest.java is passing in a local slowdebug build on Fedora Linux x64.


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
  • JDK-8361748 needs maintainer approval

Issue

  • JDK-8361748: Enforce limits on the size of an XBM image (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3135

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 18, 2025

👋 Welcome back fferrari! 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 Dec 18, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport c71be802b530034169d17325478dba6e2f1c3238 8361748: Enforce limits on the size of an XBM image Dec 18, 2025
@openjdk
Copy link

openjdk bot commented Dec 18, 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 rfr Pull request is ready for review labels Dec 18, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 18, 2025

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This looks good. Tiny nit about the copyright. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

The JDK 17u patch updates the copyright in this file for the end year to 2025. I think we should do that here as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, done: 5dd495e.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Backport looks good, with just differing context and the manually applied copyright header change. In fact, would have been clean if not for JDK-8211300: "Convert C-style array declarations in JDK client code", the only change to this file in years.

Due to JDK-8373727, I think we should hold off on approving and integrating this until we know there is a fix for this regression. I don't want us to end up having to back it out of the April release.

@openjdk
Copy link

openjdk bot commented Dec 22, 2025

⚠️ @franferrax 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.

@franferrax
Copy link
Contributor Author

@gnu-andrew: sure, let's keep it on hold, I won't apply for maintainer approval until JDK-8373727 gets fixed.

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 rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

3 participants