[prev in list] [next in list] [prev in thread] [next in thread]
List: openjdk-2d-dev
Subject: Re: [OpenJDK 2D-Dev] RFR: 8230480: check malloc/calloc results in java.desktop
From: Phil Race <philip.race () oracle ! com>
Date: 2019-09-04 16:23:05
Message-ID: 38161194-7a5a-389f-06f2-f52d1b18f9da () oracle ! com
[Download RAW message or body]
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.race@oracle.com>
> *Sent:* Dienstag, 3. September 2019 18:58
> *To:* Baesken, Matthias <matthias.baesken@sap.com>;
> awt-dev@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
>
[Attachment #3 (text/html)]
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
</head>
<body text="#000000" bgcolor="#FFFFFF">
OK. Approved. Please push to jdk/client, not jdk/jdk, unless at
least you've run<br>
the *headful* jtreg tests on Linux, and sound tests on Mac .. <br>
<br>
-phil.<br>
<br>
<div class="moz-cite-prefix">On 9/4/19 1:56 AM, Baesken, Matthias
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:VI1PR02MB508661B3FC96E4966AFCA00A93B80@VI1PR02MB5086.eurprd02.prod.outlook.com">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<meta name="Generator" content="Microsoft Word 15 (filtered
medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
color:black;
mso-fareast-language:EN-US;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
pre
{mso-style-priority:99;
mso-style-link:"HTML Preformatted Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";
color:black;}
p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
{mso-style-priority:34;
margin-top:0cm;
margin-right:0cm;
margin-bottom:0cm;
margin-left:36.0pt;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
color:black;
mso-fareast-language:EN-US;}
p.msonormal0, li.msonormal0, div.msonormal0
{mso-style-name:msonormal;
mso-margin-top-alt:auto;
margin-right:0cm;
mso-margin-bottom-alt:auto;
margin-left:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;
color:black;}
span.HTMLPreformattedChar
{mso-style-name:"HTML Preformatted Char";
mso-style-priority:99;
mso-style-link:"HTML Preformatted";
font-family:"Courier New";
mso-fareast-language:DE;}
span.EmailStyle20
{mso-style-type:personal;
font-family:"Calibri",sans-serif;
color:windowtext;}
span.new
{mso-style-name:new;}
span.EmailStyle22
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:70.85pt 70.85pt 2.0cm 70.85pt;}
div.WordSection1
{page:WordSection1;}
/* List Definitions */
@list l0
{mso-list-id:47148822;
mso-list-type:hybrid;
mso-list-template-ids:328644122 1631453322 67567619 67567621 67567617 67567619 \
67567621 67567617 67567619 67567621;} @list l0:level1
{mso-level-start-at:570;
mso-level-number-format:bullet;
mso-level-text:-;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Calibri",sans-serif;
mso-fareast-font-family:Calibri;}
@list l0:level2
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Courier New";}
@list l0:level3
{mso-level-number-format:bullet;
mso-level-text:\F0A7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Wingdings;}
@list l0:level4
{mso-level-number-format:bullet;
mso-level-text:\F0B7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Symbol;}
@list l0:level5
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Courier New";}
@list l0:level6
{mso-level-number-format:bullet;
mso-level-text:\F0A7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Wingdings;}
@list l0:level7
{mso-level-number-format:bullet;
mso-level-text:\F0B7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Symbol;}
@list l0:level8
{mso-level-number-format:bullet;
mso-level-text:o;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:"Courier New";}
@list l0:level9
{mso-level-number-format:bullet;
mso-level-text:\F0A7;
mso-level-tab-stop:none;
mso-level-number-position:left;
text-indent:-18.0pt;
font-family:Wingdings;}
ol
{margin-bottom:0cm;}
ul
{margin-bottom:0cm;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
<div class="WordSection1">
<p class="MsoNormal"><span style="color:windowtext" lang="EN-US">Hi
Phil , I think you are right, the “depth > 12” is a
legitimate case so no freeing should be done there \
.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:windowtext" lang="EN-US"><o:p> \
</o:p></span></p>
<p class="MsoNormal"><span style="color:windowtext" lang="EN-US">New
webrev :<o:p></o:p></span></p>
<ul style="margin-top:0cm" type="disc">
<li class="MsoListParagraph"
style="color:windowtext;margin-left:0cm;mso-list:l0 level1
lfo1">
<span lang="EN-US">Removed the free for “depth > 12” \
<o:p></o:p></span></li> <li class="MsoListParagraph"
style="color:windowtext;margin-left:0cm;mso-list:l0 level1
lfo1">
<span lang="EN-US">ZALLOC-ed “awt_data->color_data =
ZALLOC (_ColorData);” in X11Color.c needs return value
handling too<o:p></o:p></span></li>
</ul>
<p class="MsoListParagraph"><span style="color:windowtext"
lang="EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:windowtext" lang="EN-US"><o:p> \
</o:p></span></p> <p class="MsoNormal"><a
href="http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.1/"
moz-do-not-send="true">http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.1/</a><o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="color:windowtext"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:windowtext">Best
regards, Matthias<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:windowtext"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:windowtext"><o:p> </o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0cm
0cm 0cm 4.0pt">
<div>
<div style="border:none;border-top:solid #E1E1E1
1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span
style="color:windowtext;mso-fareast-language:DE"
lang="EN-US">From:</span></b><span
style="color:windowtext;mso-fareast-language:DE"
lang="EN-US"> Phil Race <a class="moz-txt-link-rfc2396E" \
href="mailto:philip.race@oracle.com"><philip.race@oracle.com></a> <br>
<b>Sent:</b> Dienstag, 3. September 2019 18:58<br>
<b>To:</b> Baesken, Matthias
<a class="moz-txt-link-rfc2396E" \
href="mailto:matthias.baesken@sap.com"><matthias.baesken@sap.com></a>; <a \
class="moz-txt-link-abbreviated" \
href="mailto:awt-dev@openjdk.java.net">awt-dev@openjdk.java.net</a>; <a \
class="moz-txt-link-abbreviated" \
href="mailto:2d-dev@openjdk.java.net">2d-dev@openjdk.java.net</a><br> \
<b>Subject:</b> Re: [OpenJDK 2D-Dev] RFR: 8230480:
check malloc/calloc results in java.desktop<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal" style="margin-bottom:12.0pt">I am not
sure about that free you added.<br>
A return of "1" means success. And a caller is then
expecting the awtImage to be valid.<br>
<br>
How did you determine that this was the correct thing to do
here ?<br>
<br>
-phil.<span style="mso-fareast-language:DE"><o:p></o:p></span></p>
<div>
<p class="MsoNormal">On 9/3/19 8:40 AM, Baesken, Matthias
wrote:<o:p></o:p></p>
</div>
<blockquote style="margin-top:5.0pt;margin-bottom:5.0pt">
<p class="MsoNormal"><span lang="EN-US">Hello, please
review this small change .</span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US">I noticed that at a
few places in java.desktop checking malloc/calloc
return values is not done.</span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US">This should be
changed .</span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US">Additionally I
think we miss here a free in an early return, changed
it too :</span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><a
href="http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.0/src/java.desktop/unix/native/common/awt/X11Color.c.frames.html"
moz-do-not-send="true"><span \
lang="EN-US">http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.0/src/java.desktop/unix/native/common/awt/X11Color.c.frames.html</span></a><o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US">567 if (depth
> 12) {</span><o:p></o:p></p>
<p class="MsoNormal"><a name="2" moz-do-not-send="true"></a><span
lang="EN-US">568 free \
(awt_data->awtImage);</span><o:p></o:p></p> <p class="MsoNormal"><span \
lang="EN-US">569 return 1;</span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US">570 }</span><o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US">Build/webrev \
:</span><o:p></o:p></p>
<p class="MsoNormal"><span lang="EN-US"> </span><o:p></o:p></p>
<p class="MsoNormal"><a
href="https://bugs.openjdk.java.net/browse/JDK-8230480"
moz-do-not-send="true">https://bugs.openjdk.java.net/browse/JDK-8230480</a><o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"><a
href="http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.0/"
moz-do-not-send="true">http://cr.openjdk.java.net/~mbaesken/webrevs/8230480.0/</a><o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal"> <o:p></o:p></p>
<p class="MsoNormal">Thanks, Matthias<o:p></o:p></p>
</blockquote>
<p class="MsoNormal"><span style="mso-fareast-language:DE"><o:p> \
</o:p></span></p> </div>
</div>
</blockquote>
<br>
</body>
</html>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic