OK. Approved. Please push to jdk/client, not jdk/jdk, unless at least
you've run
the *headful* jtreg tests on Linux, and sound tests on Mac ..
-phil.
On 9/4/19 1:56 AM, Baesken, Matthias wrote:
Hi Phil , I think you are right, the “depth > 12” is a
legitimate case so no freeing should be done there .
New webrev :
* Removed the free for “depth > 12”
* ZALLOC-ed “awt_data->color_data = ZALLOC (_ColorData);” in
X11Color.c needs return value handling too
http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.1/
Best regards, Matthias
*From:*Phil Race <philip.r...@oracle.com>
*Sent:* Dienstag, 3. September 2019 18:58
*To:* Baesken, Matthias <matthias.baes...@sap.com>;
awt-...@openjdk.java.net; 2d-dev@openjdk.java.net
*Subject:* Re: [OpenJDK 2D-Dev] RFR: 8230480: check malloc/calloc
results in java.desktop
I am not sure about that free you added.
A return of "1" means success. And a caller is then expecting the
awtImage to be valid.
How did you determine that this was the correct thing to do here ?
-phil.
On 9/3/19 8:40 AM, Baesken, Matthias wrote:
Hello, please review this small change .
I noticed that at a few places in java.desktop checking
malloc/calloc return values is not done.
This should be changed .
Additionally I think we miss here a free in an early return,
changed it too :
http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.0/src/java.desktop/unix/native/common/awt/X11Color.c.frames.html
567 if (depth > 12) {
568 free (awt_data->awtImage);
569 return 1;
570 }
Build/webrev :
https://bugs.openjdk.java.net/browse/JDK-8230480
http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.0/
Thanks, Matthias
