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

diff --git a/ChangeLog b/ChangeLog
index 5f87a00f614ef6c96b9f04b55fa454d99c317280..339b99434fd612f84a2d71a1fb1cc10f4fe4974f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 12c1e5ebc8143c0b1655e059b38afa6d16f4c277..148ef751eb0d849df00e3797a71dc554307fd46e 100644 (file)
--- 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);