summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-08-02 11:29:31 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-08-02 11:29:31 +0000
commit4998d8c46936a12c9208273339a768277885f36f (patch)
treece029ec6bd4696f52d243700872038bb1371b443
parentc364ffa34036610664c3ba6089009f9c86c1e8fb (diff)
downloadgtk+-4998d8c46936a12c9208273339a768277885f36f.tar.gz
Bug 538686 - gtkprintoperation-win32.c: devmode_from_settings
2008-08-02 Tor Lillqvist <tml@novell.com> Bug 538686 - gtkprintoperation-win32.c: devmode_from_settings * gtk/gtkprintoperation-win32.c (devmode_from_settings): Plug potential leak. Thanks to Morten Welinder. svn path=/trunk/; revision=20944
-rw-r--r--ChangeLog7
-rw-r--r--gtk/gtkprintoperation-win32.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f87a00f61..339b99434f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2008-08-02 Tor Lillqvist <tml@novell.com>
+ Bug 538686 - gtkprintoperation-win32.c: devmode_from_settings
+
+ * gtk/gtkprintoperation-win32.c (devmode_from_settings): Plug
+ potential leak. Thanks to Morten Welinder.
+
+2008-08-02 Tor Lillqvist <tml@novell.com>
+
* gtk/gtkprint-win32.c
* gtk/gtkprint-win32.h
* gtk/gtkprintoperation-win32.c: Cosmetic fixups after patch
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 12c1e5ebc8..148ef751eb 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -940,8 +940,8 @@ devmode_from_settings (GtkPrintSettings *settings,
{
devmode->dmDriverExtra = extras_len;
memcpy (((char *)devmode) + sizeof (DEVMODEW), extras, extras_len);
- g_free (extras);
}
+ g_free (extras);
if (gtk_print_settings_has_key (settings, GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION))
devmode->dmDriverVersion = gtk_print_settings_get_int (settings, GTK_PRINT_SETTINGS_WIN32_DRIVER_VERSION);