[PATCH 0/1] MR3861: gdiplus: Copy the compound array in GdipClonePen().

[PATCH 1/1] gdiplus: Copy the compound array in GdipClonePen().

[Huw Davies]

From: Huw Davies

---
 dlls/gdiplus/pen.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c
index 6446b725e4d..fac31d6e84e 100644
--- a/dlls/gdiplus/pen.c
+++ b/dlls/gdiplus/pen.c
@@ -103,6 +103,7 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen)
     (*clonepen)->customend = NULL;
     (*clonepen)->brush = NULL;
     (*clonepen)->dashes = NULL;
+    (*clonepen)->compound_array = NULL;

stat = GdipCloneBrush(pen->brush, &(*clonepen)->brush);

@@ -121,6 +122,15 @@ GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen)
             stat = OutOfMemory;
     }

+    if (stat == Ok && pen->compound_array)
+    {
+        (*clonepen)->compound_array = heap_alloc_zero(pen->compound_array_size * sizeof(REAL));
+        if ((*clonepen)->compound_array)
+            memcpy((*clonepen)->compound_array, pen->compound_array, pen->compound_array_size * sizeof(REAL));
+        else
+            stat = OutOfMemory;
+    }
+
     if (stat != Ok)
     {
         GdipDeletePen(*clonepen);

[Esme Povirk (＠madewokherd)]

I think we also need to set compound_array_size here.

[Esme Povirk (＠madewokherd)]

On Fri Sep 15 20:38:13 2023 +0000, Esme Povirk wrote:
> I think we also need to set compound_array_size here.

Oh never mind, it's covered by the initial copy.

[PATCH 0/1] MR3861: gdiplus: Copy the compound array in GdipClonePen(). - approved

[Esme Povirk (＠madewokherd)]

This merge request was approved by Esme Povirk.

[Huw Davies (＠huw)]

On Fri Sep 15 20:39:40 2023 +0000, Esme Povirk wrote:
> Oh never mind, it's covered by the initial copy.

Yes, exactly.  Just like `numdashes` above this.