Plug memory leak. (#140775, John Ehresman)

2004-04-29  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory
	leak. (#140775, John Ehresman)

diff --git a/ChangeLog b/ChangeLog
index bc358b3888567b52e9bdca4141b7f09ffcb0da71..fd6136f34e7df1174e85271dceb1b42d18c755fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-29  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory
+       leak. (#140775, John Ehresman)
+
 Thu Apr 29 01:09:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (_gdk_drawable_get_scratch_gc): Use depth - 1

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bc358b3888567b52e9bdca4141b7f09ffcb0da71..fd6136f34e7df1174e85271dceb1b42d18c755fc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-04-29  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory
+       leak. (#140775, John Ehresman)
+
 Thu Apr 29 01:09:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (_gdk_drawable_get_scratch_gc): Use depth - 1

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bc358b3888567b52e9bdca4141b7f09ffcb0da71..fd6136f34e7df1174e85271dceb1b42d18c755fc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2004-04-29  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory
+       leak. (#140775, John Ehresman)
+
 Thu Apr 29 01:09:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (_gdk_drawable_get_scratch_gc): Use depth - 1

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bc358b3888567b52e9bdca4141b7f09ffcb0da71..fd6136f34e7df1174e85271dceb1b42d18c755fc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-04-29  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory
+       leak. (#140775, John Ehresman)
+
 Thu Apr 29 01:09:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (_gdk_drawable_get_scratch_gc): Use depth - 1

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bc358b3888567b52e9bdca4141b7f09ffcb0da71..fd6136f34e7df1174e85271dceb1b42d18c755fc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-04-29  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_gc_set_dashes): Plug memory
+       leak. (#140775, John Ehresman)
+
 Thu Apr 29 01:09:50 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (_gdk_drawable_get_scratch_gc): Use depth - 1

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index d4c2af737b16fac0a7376efbec7e7f5ba6e7461a..3dbaaf013a0562edd68b1971e6d4df47f5c41c16 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -361,7 +361,7 @@ gdk_win32_gc_values_to_win32values (GdkGCValues    *values,
            {
              g_free (win32_gc->pen_dashes);
              win32_gc->pen_dashes = NULL;
-            win32_gc->pen_num_dashes = 0;
+             win32_gc->pen_num_dashes = 0;
            }
           win32_gc->pen_style &= ~(PS_STYLE_MASK);
          win32_gc->pen_style |= PS_SOLID;
@@ -593,6 +593,8 @@ gdk_win32_gc_set_dashes (GdkGC *gc,
 
   win32_gc->pen_style |= (PS_GEOMETRIC | PS_USERSTYLE);
   win32_gc->pen_num_dashes = n;
+  if (win32_gc->pen_dashes != NULL)
+    g_free (win32_gc->pen_dashes);
   win32_gc->pen_dashes = g_new (DWORD, n);
   for (i = 0; i < n; i++)
     win32_gc->pen_dashes[i] = dash_list[i];