8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment

[zhengyu123]

During initializing native data of X11GraphicsEnvironment, a single AwtGraphicsConfigData is used/reused, not only failed cases, but also succeeded cases. So AwtGraphicsConfigData internal states need to be cleanup properly to avoid memory leaks.

Test:

• jdk_awt

---

Progress

• Change must not contain extraneous whitespace
• Commit message must refer to an issue
• Change must be properly reviewed (2 reviews required, with at least 1 reviewer, 1 author)

Issue

• JDK-8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment

Reviewers

• Phil Race (@prrace - Reviewer) ⚠️ Review applies to e6838cf0
• Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8317/head:pull/8317
$ git checkout pull/8317

Update a local copy of the PR:
$ git checkout pull/8317
$ git pull https://git.openjdk.java.net/jdk pull/8317/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8317

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8317.diff

[bridgekeeper]

👋 Welcome back zgu! 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]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (64a74f3e)
• 00: Full (e6838cf0)

[openjdk]

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

8284956: Potential leak awtImageData/color_data when initializes X11GraphicsEnvironment

Reviewed-by: prr, shade

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

• 8daf08d: 8286628: Remove unused BufferNode::Allocator::flush_free_list
• 04df8b7: 8286194: ExecutorShutdown test fails intermittently
• 0be1f3e: 8286689: (se) Adjusting to select timeout after EINTR messed up after JDK-8286378
• 6a1b098: 8278039: Code completion not woking after some statements such as "if" or "while"
• 11fa03f: 8282160: JShell circularly-required classes cannot be defined
• d5ae383: 8286117: Remove unnecessary indirection and unused code in UL
• c3bade2: 8286623: Bundle zlib by default with JDK on macos aarch64
• 617ef54: 8286647: JFR: Build failure when C1 or C2 is disabled after JDK-8282420
• 369611e: 8286677: [BACKOUT] (fc) Tune FileChannel.transferFrom()
• 4b8a66a: 8286424: GetVersionEx is deprecated
• ... and 362 more: https://git.openjdk.java.net/jdk/compare/4594696f5462995ec58ca1d2c1bde7cc857c5caf...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.

[prrace]

/reviewers 2

[openjdk]

@prrace
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with 1 of role reviewers, 1 of role authors).

[shipilev]

What about _ColorData::img_grays, _ColorData::awt_Colors, _ColorData::img_oda_*?

[gnu-andrew]

I see calloc calls also for img_grays and awt_Colors. Is there a reason these aren't freed too?

[zhengyu123]

@gnu-andrew @shipilev Nice catch, fixed.

Thanks

[zhengyu123]

What about _ColorData::img_grays, _ColorData::awt_Colors, _ColorData::img_oda_*?

_ColorData::img_oda_* are not malloc'd

 awt_data->color_data->img_oda_red   = &(std_img_oda_red[0][0]);
 awt_data->color_data->img_oda_green = &(std_img_oda_green[0][0]);
 awt_data->color_data->img_oda_blue  = &(std_img_oda_blue[0][0]);

and std_img_oda_* are defined as

JNIEXPORT extern sgn_ordered_dither_array std_img_oda_red;
JNIEXPORT extern sgn_ordered_dither_array std_img_oda_green;
JNIEXPORT extern sgn_ordered_dither_array std_img_oda_blue;

[zhengyu123]

Thanks for the reviews, @prrace @shipilev and @gnu-andrew

[zhengyu123]

/integrate

[openjdk]

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

• 8daf08d: 8286628: Remove unused BufferNode::Allocator::flush_free_list
• 04df8b7: 8286194: ExecutorShutdown test fails intermittently
• 0be1f3e: 8286689: (se) Adjusting to select timeout after EINTR messed up after JDK-8286378
• 6a1b098: 8278039: Code completion not woking after some statements such as "if" or "while"
• 11fa03f: 8282160: JShell circularly-required classes cannot be defined
• d5ae383: 8286117: Remove unnecessary indirection and unused code in UL
• c3bade2: 8286623: Bundle zlib by default with JDK on macos aarch64
• 617ef54: 8286647: JFR: Build failure when C1 or C2 is disabled after JDK-8282420
• 369611e: 8286677: [BACKOUT] (fc) Tune FileChannel.transferFrom()
• 4b8a66a: 8286424: GetVersionEx is deprecated
• ... and 362 more: https://git.openjdk.java.net/jdk/compare/4594696f5462995ec58ca1d2c1bde7cc857c5caf...master

Your commit was automatically rebased without conflicts.

[openjdk]

@zhengyu123 Pushed as commit cbe7e7b.

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