rpms/glib2/devel 0001-Fix-a-alloc-free-mismatch.patch, NONE, 1.1 glib2.spec, 1.257, 1.258

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/glib2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10461

Modified Files:
	glib2.spec 
Added Files:
	0001-Fix-a-alloc-free-mismatch.patch 
Log Message:
Fix an evince crash


0001-Fix-a-alloc-free-mismatch.patch:
 gbuffer.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Fix-a-alloc-free-mismatch.patch ---
>From eb454a1cb4d8ea16f6b5575c69e58c2877ea350e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen at redhat.com>
Date: Sun, 27 Jun 2010 19:27:04 -0400
Subject: [PATCH] Fix a alloc/free mismatch

Pointed out in http://bugzilla.redhat.com/show_bug.cgi?id=608453
by David Tardon.
---
 glib/gbuffer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/glib/gbuffer.c b/glib/gbuffer.c
index 4eb83df..5830f04 100644
--- a/glib/gbuffer.c
+++ b/glib/gbuffer.c
@@ -138,7 +138,7 @@ g_buffer_free_usernotify (GBuffer *buffer)
   GUserNotifyBuffer *ubuffer = (GUserNotifyBuffer *) buffer;
 
   ubuffer->user_destroy (ubuffer->user_data);
-  g_slice_free (GBuffer, buffer);
+  g_slice_free (GUserNotifyBuffer, ubuffer);
 }
 
 /* < private >
-- 
1.7.1



Index: glib2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glib2/devel/glib2.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -p -r1.257 -r1.258
--- glib2.spec	26 Jun 2010 15:16:34 -0000	1.257
+++ glib2.spec	27 Jun 2010 23:33:16 -0000	1.258
@@ -3,7 +3,7 @@
 Summary: A library of handy utility functions
 Name: glib2
 Version: 2.25.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -27,6 +27,9 @@ BuildRequires: chrpath
 # required for GIO content-type support
 Requires: shared-mime-info
 
+# upstream fix
+Patch0: 0001-Fix-a-alloc-free-mismatch.patch
+
 %description
 GLib is the low-level core library that forms the basis for projects
 such as GTK+ and GNOME. It provides data structure handling for C,
@@ -53,6 +56,7 @@ The glib2-static package includes static
 
 %prep
 %setup -q -n glib-%{version}
+%patch0 -p1 -b .free-mismatch
 
 %build
 %configure --disable-gtk-doc \
@@ -157,6 +161,9 @@ gio-querymodules-%{__isa_bits} %{_libdir
 %{_libdir}/lib*.a
 
 %changelog
+* Sun Jun 27 2010 Matthias Clasen <mclasen at redhat.com> - 2.25.10-2
+- Fix an evince crash
+
 * Sat Jun 26 2010 Matthias Clasen <mclasen at redhat.com> - 2.25.10-1
 - Update to 2.25.10