Fixed #36 memory leak in Vcl.ButtonStylesAttributes.pas

Author: carloBarazzetta

README.htm

@@ -31,7 +31,7 @@
 </style>
 <h1>Delphi VCL StyledComponents <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg" alt="License"/></a></h1>
 <h2>Components similar to Delphi VCL Buttons, Toolbar, DbNavigator, BindNavigator, ButtonGroup and CategoryButtons with Custom Graphic Styles, and an advanced, full-customizable TaskDialog, also with animations!</h2>
-<h3>Actual official version: 3.6.3</h3>
+<h3>Actual official version: 3.6.4</h3>
 <hr />
 <h2>A brief description</h2>
 <p><strong>StyledComponents</strong> is a set of VCL components for Delphi (32 and 64 bit) that allow you to overcome the limits imposed by standard VCL components, maintaining 100% compatibility of the properties.</p>
@@ -344,6 +344,10 @@ <h3>Available from Delphi XE6 to Delphi 12 (32bit and 64bit platforms)</h3>
 <p><img src="./Images/SupportingDelphi.jpg" alt="Delphi Support"/></p>
 <p>Related links: <a href="https://www.embarcadero.com">embarcadero.com</a> - <a href="https://learndelphi.org">learndelphi.org</a></p>
 <h3>RELEASE NOTES</h3>
+<p>26 Aug 2024: version 3.6.4</p>
+<ul>
+<li>Fixed memory leak in Vcl.ButtonStylesAttributes.pas</li>
+</ul>
 <p>20 Aug 2024: version 3.6.3</p>
 <ul>
 <li>Added AutoClick and AutoClickDelay properties to StyledButton and StyledGraphicButton</li>

README.md

@@ -2,7 +2,7 @@
 
 ## Components similar to Delphi VCL Buttons, Toolbar, DbNavigator, BindNavigator, ButtonGroup and CategoryButtons with Custom Graphic Styles, and an advanced, full-customizable TaskDialog, also with animations!
 
-### Actual official version: 3.6.3
+### Actual official version: 3.6.4
 
 ---
 ## A brief description
@@ -397,6 +397,9 @@ If you are have Skia4Delphi installed, you can also try the AnimatedTaskDialogDe
 Related links: [embarcadero.com](https://www.embarcadero.com) - [learndelphi.org](https://learndelphi.org)
 
 ### RELEASE NOTES
+26 Aug 2024: version 3.6.4
+- Fixed memory leak in Vcl.ButtonStylesAttributes.pas
+
 20 Aug 2024: version 3.6.3
 - Added AutoClick and AutoClickDelay properties to StyledButton and StyledGraphicButton
 - Added AutoClick and AutoClickDelay properties to StyledTaskDialog

packages/D11/StyledAnimatedComponents.dproj

@@ -130,6 +130,8 @@
                     <Source Name="MainSource">StyledAnimatedComponents.dpk</Source>
                 </Source>
                 <Excluded_Packages/>
+                <WelcomePageFile Path="..\..\README.htm"/>
+                <WelcomePageFolder/>
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">True</Platform>

packages/D11/StyledComponents.dproj

@@ -141,6 +141,8 @@
                     <Source Name="MainSource">StyledComponents.dpk</Source>
                 </Source>
                 <Excluded_Packages/>
+                <WelcomePageFile Path="..\..\README.htm"/>
+                <WelcomePageFolder/>
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">True</Platform>

packages/D12/dclStyledAnimatedComponents.res

@@ -1534,42 +1534,45 @@ function GetRoundedCornersPath(ARectangle: TGPRectF;
 const
   d0 = 0.0001;
 var
-  LPath : TGPGraphicsPath;
   l, t, w, h, d : Single;
 begin
-  LPath := TGPGraphicsPath.Create;
-  l := ARectangle.X;
-  t := ARectangle.Y;
-  w := ARectangle.Width;
-  h := ARectangle.Height;
-  d := ARadius / 2;
-  d := Min(d, Min(ARectangle.Width, ARectangle.Height));
-  // topleft
-  if rcTopLeft in ARoundedCorners then
-    LPath.AddArc(l, t, d, d, 180, 90)
-  else
-    LPath.AddArc(l, t, d0, d0, 180, 90);
+  Result := TGPGraphicsPath.Create;
+  try
+    l := ARectangle.X;
+    t := ARectangle.Y;
+    w := ARectangle.Width;
+    h := ARectangle.Height;
+    d := ARadius / 2;
+    d := Min(d, Min(ARectangle.Width, ARectangle.Height));
+    // topleft
+    if rcTopLeft in ARoundedCorners then
+      Result.AddArc(l, t, d, d, 180, 90)
+    else
+      Result.AddArc(l, t, d0, d0, 180, 90);
 
-  // topright
-  if rcTopRight in ARoundedCorners then
-    LPath.AddArc(l + w - d, t, d, d, 270, 90)
-  else
-    LPath.AddArc(l + w - d0, t, d0, d0, 270, 90);
+    // topright
+    if rcTopRight in ARoundedCorners then
+      Result.AddArc(l + w - d, t, d, d, 270, 90)
+    else
+      Result.AddArc(l + w - d0, t, d0, d0, 270, 90);
 
-  // bottomright
-  if rcBottomRight in ARoundedCorners then
-    LPath.AddArc(l + w - d, t + h - d, d, d, 0, 90)
-  else
-    LPath.AddArc(l + w - d0, t + h - d0, d0, d0, 0, 90);
+    // bottomright
+    if rcBottomRight in ARoundedCorners then
+      Result.AddArc(l + w - d, t + h - d, d, d, 0, 90)
+    else
+      Result.AddArc(l + w - d0, t + h - d0, d0, d0, 0, 90);
 
-  // bottomleft
-  if rcBottomLeft in ARoundedCorners then
-    LPath.AddArc(l, t + h - d, d, d, 90, 90)
-  else
-    LPath.AddArc(l, t + h - d0, d0, d0, 90, 90);
+    // bottomleft
+    if rcBottomLeft in ARoundedCorners then
+      Result.AddArc(l, t + h - d, d, d, 90, 90)
+    else
+      Result.AddArc(l, t + h - d0, d0, d0, 90, 90);
 
-  LPath.CloseFigure();
-  result := LPath;
+    Result.CloseFigure();
+  except
+    FreeAndNil(Result);
+    raise;
+  end
 end;
 
 function GPColor(AColor: TColor): TGPColor;
@@ -2217,6 +2220,8 @@ procedure CanvasDrawShape(const ACanvas: TCanvas; ARect: TRect;
 begin
   LGraphics := nil;
   LPen := nil;
+  LBrush := nil;
+  LPath := nil;
   try
     X := ARect.Left;
     Y := ARect.Top;
@@ -2272,6 +2277,8 @@ procedure CanvasDrawShape(const ACanvas: TCanvas; ARect: TRect;
   finally
     LGraphics.Free;
     LPen.Free;
+    LBrush.Free;
+    LPath.Free;
   end;
 end;
 {$else}