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

8280743: HSDB "Monitor Cache Dump" command might throw NPE #15369

Closed
wants to merge 2 commits into from

Conversation

plummercj
Copy link
Contributor

@plummercj plummercj commented Aug 21, 2023

ObjectMonitor.object() can be null so we need to defend against it. This bug was discovered by code inspection while working on JDK-8280555. We have no test for this, and I'm not sure how to reproduce this with HSDB like the JDK-8280555 test did. I did at least verify that the HSDB "Monitor Cache Dump" feature still works after this fix, although none of the monitors had a null object.


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-8280743: HSDB "Monitor Cache Dump" command might throw NPE (Bug - P5)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15369

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2023

👋 Welcome back cjplummer! 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 changed the title 8280743 8280743: HSDB "Monitor Cache Dump" command might throw NPE Aug 21, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 21, 2023
@openjdk
Copy link

openjdk bot commented Aug 21, 2023

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

  • serviceability

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 serviceability serviceability-dev@openjdk.org label Aug 21, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2023

Webrevs

Copy link
Contributor

@kevinjwalls kevinjwalls left a comment

Choose a reason for hiding this comment

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

I see ObjectHeap accepts and handles a null, returning null, so the newOop() call is OK to pass a null, though it could be moved to inside the else.
Maybe you're saying it's best that the Heap decides if null handle means null oop. 8-)

@plummercj
Copy link
Contributor Author

I see ObjectHeap accepts and handles a null, returning null, so the newOop() call is OK to pass a null, though it could be moved to inside the else.

Ok. I moved it inside the else block.

Copy link
Contributor

@sspitsyn sspitsyn left a comment

Choose a reason for hiding this comment

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

Looks good and safe to fix. :)
Thanks,
Serguei

@openjdk
Copy link

openjdk bot commented Aug 23, 2023

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

8280743: HSDB "Monitor Cache Dump" command might throw NPE

Reviewed-by: kevinw, sspitsyn

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

  • ba6cdbe: 8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154
  • 9f4a9fe: 8312434: SPECjvm2008/xml.transform with CDS fails with "can't seal package nu.xom"
  • 7c169a4: 8312232: Remove sun.jvm.hotspot.runtime.VM.buildLongFromIntsPD()
  • 2eae13c: 8214248: (fs) Files:mismatch spec clarifications
  • ce1ded1: 8314749: Remove unimplemented _Copy_conjoint_oops_atomic
  • 32bf468: 8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data
  • eb06572: 8313408: Use SVG for BoxLayout example
  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • f39fc0a: 8314738: Remove all occurrences of and support for @Revised
  • ... and 6 more: https://git.openjdk.org/jdk/compare/78f74bc8ff1e673991d91a55ef70880d9fb3f6b5...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 Aug 23, 2023
@plummercj
Copy link
Contributor Author

Thanks for the reviews Kevin and Serguei!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 23, 2023

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

  • 9435cd1: 8175874: Update Security.insertProviderAt to specify behavior when requested position is out of range.
  • dbb788f: 8294535: Add screen capture functionality to PassFailJFrame
  • fae3b02: 8314746: Remove unused private put* methods from DirectByteBufferR
  • 096b7ff: 8314810: (fs) java/nio/file/Files/CopyInterference.java should use TestUtil::supportsLinks
  • 6261020: 8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
  • 703817d: 8314517: some tests fail in case ipv6 is disabled on the machine
  • 742e319: 8314157: G1: "yielded" is not initialized on some paths after JDK-8140326
  • 1cee3b9: 8313262: C2: Sinking node may cause required cast to be dropped
  • f8203cb: 8313626: C2 crash due to unexpected exception control flow
  • 2be469f: 8314743: Use of uninitialized local in SR_initialize after JDK-8314114
  • ... and 20 more: https://git.openjdk.org/jdk/compare/78f74bc8ff1e673991d91a55ef70880d9fb3f6b5...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 23, 2023

@plummercj Pushed as commit 2c60cad.

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