rpms/libgnomekbd/devel bad-free.patch, NONE, 1.1 libgnomekbd.spec, 1.22, 1.23

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libgnomekbd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20843

Modified Files:
	libgnomekbd.spec 
Added Files:
	bad-free.patch 
Log Message:
fix a bad free


bad-free.patch:

--- NEW FILE bad-free.patch ---
diff -up libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c.bad-free libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c
--- libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c.bad-free	2007-08-13 12:47:51.000000000 -0400
+++ libgnomekbd-2.19.90/libgnomekbd/gkbd-indicator-config.c	2007-08-13 12:49:00.000000000 -0400
@@ -193,7 +193,7 @@ gkbd_indicator_config_init (GkbdIndicato
 			    GConfClient * conf_client, XklEngine * engine)
 {
 	GError *gerror = NULL;
-	gchar *sp, *datadir;
+	gchar *sp;
 
 	memset (ind_config, 0, sizeof (*ind_config));
 	ind_config->conf_client = conf_client;
@@ -211,7 +211,6 @@ gkbd_indicator_config_init (GkbdIndicato
 
 	ind_config->icon_theme = gtk_icon_theme_get_default ();
 
-	datadir = DATADIR;
 	gtk_icon_theme_append_search_path (ind_config->icon_theme, sp =
 					   g_build_filename (g_get_home_dir
 							     (),
@@ -221,18 +220,17 @@ gkbd_indicator_config_init (GkbdIndicato
 
 	gtk_icon_theme_append_search_path (ind_config->icon_theme,
 					   sp =
-					   g_build_filename (datadir,
+					   g_build_filename (DATADIR,
 							     "pixmaps/flags",
 							     NULL));
 	g_free (sp);
 
 	gtk_icon_theme_append_search_path (ind_config->icon_theme,
 					   sp =
-					   g_build_filename (datadir,
+					   g_build_filename (DATADIR,
 							     "icons/flags",
 							     NULL));
 	g_free (sp);
-	g_free (datadir);
 }
 
 void


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libgnomekbd.spec	13 Aug 2007 01:01:27 -0000	1.22
+++ libgnomekbd.spec	13 Aug 2007 17:03:16 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:       	2.19.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@
 Patch1:         libgnomekbd-0.1-werror.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=353163
 Patch5:         libgnomekbd-2.17.2-redraw.patch
+# 
+Patch6:		bad-free.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +57,7 @@
 %setup -q
 %patch1 -p1 -b .werror
 %patch5 -p1 -b .redraw
+%patch6 -p1 -b .bad-free
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -123,6 +126,9 @@
 
 
 %changelog
+* Mon Aug 13 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-2
+- Fix a bad free
+
 * Sun Aug 12 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.90-1
 - Update to 2.19.90