rpms/libbonobo/F-12 memory-corruption.patch, NONE, 1.1 libbonobo.spec, 1.92, 1.93

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libbonobo/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17389

Modified Files:
	libbonobo.spec 
Added Files:
	memory-corruption.patch 
Log Message:
fix a use-after-free


memory-corruption.patch:
 bonobo-activation-mime.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE memory-corruption.patch ---
diff -up libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c.memory-corruption libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c
--- libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c.memory-corruption	2009-10-06 21:24:22.763859762 -0400
+++ libbonobo-2.24.2/bonobo-activation/bonobo-activation-mime.c	2009-10-06 21:24:52.480866308 -0400
@@ -292,7 +292,6 @@ gnome_vfs_mime_get_short_list_components
 	query = g_strconcat ("bonobo:supported_mime_types.has_one (['", mime_type, 
 			     "', '", supertype,
 			     "', '*'])", NULL);
-	g_free (supertype);
 	
         /* Prefer something that matches the exact type to something
            that matches the supertype */
@@ -313,6 +312,7 @@ gnome_vfs_mime_get_short_list_components
 		components_list = NULL;
 	}
 
+	g_free (supertype);
 	g_free (query);
 	g_free (sort[0]);
 	g_free (sort[1]);


Index: libbonobo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libbonobo/F-12/libbonobo.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -p -r1.92 -r1.93
--- libbonobo.spec	24 Sep 2009 01:43:29 -0000	1.92
+++ libbonobo.spec	7 Oct 2009 01:29:50 -0000	1.93
@@ -6,7 +6,7 @@
 Summary: Bonobo component system
 Name: libbonobo
 Version: 2.24.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://ftp.gnome.org
 Source0: http://download.gnome.org/sources/libbonobo/2.24/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -27,6 +27,8 @@ Obsoletes: bonobo-activation
 Provides: bonobo-activation = %{version}-%{release}
 
 Patch0: libbonobo-multishlib.patch
+# from upstream
+Patch1: memory-corruption.patch
 
 %description
 Bonobo is a component system based on CORBA, used by the GNOME desktop.
@@ -58,6 +60,7 @@ use Bonobo.
 %ifarch ppc64 s390x x86_64
 %patch0 -p1 -b .multishlib
 %endif
+%patch1 -p1 -b .memory-corruption
 
 automake
 
@@ -126,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/bonobo-activation
 
 %changelog
+* Tue Oct  6 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-2
+- Fix a use-after-free in the mime code
+
 * Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 2.24.2-1
 - Update to 2.24.2