summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2004-04-29 10:06:12 +0000
committerTor Lillqvist <tml@src.gnome.org>2004-04-29 10:06:12 +0000
commitf215db2b12d2b7afca6ea135d5246aa7a01cf738 (patch)
treee698e4dc7e1d5ccadd8c515d20aaeafac61e79fa
parent08580edf1687bcbb5715166846d671c709d42ff7 (diff)
downloadgdk-pixbuf-f215db2b12d2b7afca6ea135d5246aa7a01cf738.tar.gz
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)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gdk/win32/gdkgc-win32.c4
6 files changed, 28 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bc358b388..fd6136f34 100644
--- 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 bc358b388..fd6136f34 100644
--- 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 bc358b388..fd6136f34 100644
--- 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 bc358b388..fd6136f34 100644
--- 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 bc358b388..fd6136f34 100644
--- 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 d4c2af737..3dbaaf013 100644
--- 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];