8311647: Memory leak in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r #14832

kspeeyu · 2023-07-11T16:51:15Z

Allocated data on error path is deleted before return

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-8311647: Memory leak in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r (Bug - P4)

Reviewers

Paul Hohensee (@phohensee - Reviewer)
Aleksey Shipilev (@shipilev - Reviewer)
Jan Lahoda (@lahodaj - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14832

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-07-11T16:53:02Z

👋 Welcome back kspeeyu! 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 · 2023-07-11T16:54:31Z

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

kulla

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 · 2023-07-11T16:58:28Z

Webrevs

01: Full - Incremental (80aedc23)
00: Full (e6f52905)

openjdk · 2023-07-11T19:56:17Z

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

8311647: Memory leak in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r

Reviewed-by: phh, shade, jlahoda

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

c7c6d47: 6355567: AdobeMarkerSegment causes failure to read valid JPEG
af7f95e: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
c710e71: 8311102: Write annotations in the classfile dumped by SA
61932f4: 8244289: fatal error: Possible safepoint reached by thread that does not allow it
8c9d091: 8308047: java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java timed out and also had jcmd pipe errors
b587fc5: 8312013: avoid UnixConstants.java.template warning: 'linux' is not defined on AIX
135f64e: 8311583: tableswitch broken by JDK-8310577
6895deb: 8311536: JFR TestNativeMemoryUsageEvents fails in huge pages configuration
bb5278d: 8311239: GC: Remove trailing blank lines in source files
92a04e2: 8311867: StructuredTaskScope.shutdown does not interrupt newly started threads
... and 32 more: https://git.openjdk.org/jdk/compare/940a4e12d1b304fb841f5bcdbd2b62fac692f3b1...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee, @shipilev, @lahodaj) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

kspeeyu · 2023-07-11T21:08:28Z

/integrate

openjdk · 2023-07-11T21:09:35Z

@kspeeyu
Your change (at version e6f5290) is now ready to be sponsored by a Committer.

shipilev · 2023-07-13T08:40:33Z

src/jdk.internal.le/linux/native/lible/CLibrary.cpp

@@ -188,6 +188,7 @@ JNIEXPORT void JNICALL Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibr

    if (error != 0) {
        throw_errno(env);
+        delete[] data;


While JNI would not transfer control immediately on Throw, and would only throw it on return, it is a good style to do cleanups first, and then do throw, followed by immediate return.

In other words, flip the order of delete[] and throw_errno.

shipilev

Looks fine to me.
@lahodaj, want to take a look? It is your code :)

lahodaj

Looks good to me, thanks!

shipilev · 2023-07-13T18:48:29Z

Excellent, thanks!

/sponsor

openjdk · 2023-07-13T18:50:16Z

@shipilev The PR has been updated since the change author (@kspeeyu) issued the integrate command - the author must perform this command again.

kspeeyu · 2023-07-13T20:34:19Z

/integrate

openjdk · 2023-07-13T20:36:30Z

@kspeeyu
Your change (at version 80aedc2) is now ready to be sponsored by a Committer.

phohensee · 2023-07-13T22:08:37Z

/sponsor

openjdk · 2023-07-13T22:09:24Z

Going to push as commit 43099a8.
Since your change was applied there have been 42 commits pushed to the master branch:

c7c6d47: 6355567: AdobeMarkerSegment causes failure to read valid JPEG
af7f95e: 8310070: Test: javax/net/ssl/DTLS/DTLSWontNegotiateV10.java timed out
c710e71: 8311102: Write annotations in the classfile dumped by SA
61932f4: 8244289: fatal error: Possible safepoint reached by thread that does not allow it
8c9d091: 8308047: java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java timed out and also had jcmd pipe errors
b587fc5: 8312013: avoid UnixConstants.java.template warning: 'linux' is not defined on AIX
135f64e: 8311583: tableswitch broken by JDK-8310577
6895deb: 8311536: JFR TestNativeMemoryUsageEvents fails in huge pages configuration
bb5278d: 8311239: GC: Remove trailing blank lines in source files
92a04e2: 8311867: StructuredTaskScope.shutdown does not interrupt newly started threads
... and 32 more: https://git.openjdk.org/jdk/compare/940a4e12d1b304fb841f5bcdbd2b62fac692f3b1...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-07-13T22:09:31Z

@phohensee @kspeeyu Pushed as commit 43099a8.

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

deleting allocated data before return

e6f5290

openjdk bot added the rfr Pull request is ready for review label Jul 11, 2023

openjdk bot added the kulla kulla-dev@openjdk.org label Jul 11, 2023

phohensee approved these changes Jul 11, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 11, 2023

openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 11, 2023

shipilev suggested changes Jul 13, 2023

View reviewed changes

cleanup before throw

80aedc2

openjdk bot removed the sponsor Pull request is ready to be sponsored label Jul 13, 2023

shipilev approved these changes Jul 13, 2023

View reviewed changes

lahodaj approved these changes Jul 13, 2023

View reviewed changes

phohensee approved these changes Jul 13, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 13, 2023

openjdk bot added the integrated Pull request has been integrated label Jul 13, 2023

openjdk bot closed this Jul 13, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jul 13, 2023

8311647: Memory leak in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r #14832

8311647: Memory leak in Java_jdk_internal_org_jline_terminal_impl_jna_linux_CLibraryImpl_ttyname_1r #14832

Uh oh!

Conversation

kspeeyu commented Jul 11, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jul 11, 2023

Uh oh!

openjdk bot commented Jul 11, 2023

Uh oh!

mlbridge bot commented Jul 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

openjdk bot commented Jul 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kspeeyu commented Jul 11, 2023

Uh oh!

openjdk bot commented Jul 11, 2023

Uh oh!

shipilev Jul 13, 2023

Choose a reason for hiding this comment

Uh oh!

kspeeyu Jul 13, 2023

Choose a reason for hiding this comment

Uh oh!

shipilev left a comment

Choose a reason for hiding this comment

Uh oh!

lahodaj left a comment

Choose a reason for hiding this comment

Uh oh!

shipilev commented Jul 13, 2023

Uh oh!

openjdk bot commented Jul 13, 2023

Uh oh!

kspeeyu commented Jul 13, 2023

Uh oh!

openjdk bot commented Jul 13, 2023

Uh oh!

phohensee commented Jul 13, 2023

Uh oh!

openjdk bot commented Jul 13, 2023

Uh oh!

openjdk bot commented Jul 13, 2023

Uh oh!

Uh oh!

kspeeyu commented Jul 11, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jul 11, 2023 •

edited

Loading

openjdk bot commented Jul 11, 2023 •

edited

Loading