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.

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

JDK-8313252: Java_sun_awt_windows_ThemeReader_paintBackground release resources in early returns #15064

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Jul 28, 2023

In file ThemeReader.cpp functionJava_sun_awt_windows_ThemeReader_paintBackground
we create DCs and release them at the end, but seems we miss it in early returns.

While looking at the code, I noticed that CreateCompatibleDC can return NULL in case of error/failure, but we ignore this case; see
https://learn.microsoft.com/en-us/windows/win32/api/wingdi/nf-wingdi-createcompatibledc .
Should we better handle it or is it not really occurring in practise ?


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-8313252: Java_sun_awt_windows_ThemeReader_paintBackground release resources in early returns (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15064

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 28, 2023

👋 Welcome back mbaesken! 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 openjdk bot added the rfr Pull request is ready for review label Jul 28, 2023
@openjdk
Copy link

openjdk bot commented Jul 28, 2023

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

  • client

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 client client-libs-dev@openjdk.org label Jul 28, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 28, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jul 31, 2023

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

8313252: Java_sun_awt_windows_ThemeReader_paintBackground release resources in early returns

Reviewed-by: clanger

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:

  • ad34be1: 8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
  • d6245b6: 8310268: RISC-V: misaligned memory access in String.Compare intrinsic
  • 402cb6a: 8312201: Clean up common behavior in "page writers" and "member writers"
  • 23755f9: 8312411: MessageFormat.formatToCharacterIterator() can be improved
  • e2cb0bc: 8313204: Inconsistent order of sections in generated class documentation
  • 4ae75ca: 8313253: Rename methods in javadoc Comparators class
  • e897041: 8312262: Klass::array_klass() should return ArrayKlass pointer
  • a9a3463: 8312416: Tests in Locale should have more descriptive names
  • d9559f9: 8312612: handle WideCharToMultiByte return values
  • 34173ff: 8312574: jdk/jdk/jfr/jvm/TestChunkIntegrity.java fails with timeout
  • ... and 4 more: https://git.openjdk.org/jdk/compare/ba645da97b00a7cc9d5a9d4dd58b1cd6737b4822...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 31, 2023
@MBaesken
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jul 31, 2023

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

  • b60e0ad: 8313207: Remove MetaspaceShared::_has_error_classes
  • 408987e: 8313307: java/util/Formatter/Padding.java fails on some Locales
  • 6fca289: 8313023: Return value corrupted when using CCS + isTrivial (mainline)
  • f8c2b7f: 8313231: Redundant if statement in ZoneInfoFile
  • 807ca2d: 8313316: Disable runtime/ErrorHandling/MachCodeFramesInErrorFile.java on ppc64le
  • ad34be1: 8312525: New test runtime/os/TestTrimNative.java#trimNative is failing: did not see the expected RSS reduction
  • d6245b6: 8310268: RISC-V: misaligned memory access in String.Compare intrinsic
  • 402cb6a: 8312201: Clean up common behavior in "page writers" and "member writers"
  • 23755f9: 8312411: MessageFormat.formatToCharacterIterator() can be improved
  • e2cb0bc: 8313204: Inconsistent order of sections in generated class documentation
  • ... and 9 more: https://git.openjdk.org/jdk/compare/ba645da97b00a7cc9d5a9d4dd58b1cd6737b4822...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 31, 2023
@openjdk openjdk bot closed this Jul 31, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 31, 2023
@openjdk
Copy link

openjdk bot commented Jul 31, 2023

@MBaesken Pushed as commit 3671d83.

💡 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
client client-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants