- fix crash in rsvg-gobject.c:instance_dispose function

(https://bugzilla.gnome.org/show_bug.cgi?id=623383)
This commit is contained in:
Adam Tkac 2010-07-02 13:06:10 +00:00
parent 8359010bba
commit 774aab0bcc
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,36 @@
From f1ef3c88012778fe13fed466fcb2cee1eac351fd Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Fri, 2 Jul 2010 14:47:07 +0200
Subject: [PATCH] rsvg-gobject.c: g_free object after we free all it's attributes, not before
(in instance_dispose() function)
Signed-off-by: Adam Tkac <atkac@redhat.com>
---
rsvg-gobject.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsvg-gobject.c b/rsvg-gobject.c
index 61b7cb8..43fb5a8 100644
--- a/rsvg-gobject.c
+++ b/rsvg-gobject.c
@@ -134,8 +134,6 @@ instance_dispose (GObject * instance)
if (self->priv->base_uri)
g_free (self->priv->base_uri);
- g_free (self->priv);
-
#if GLIB_CHECK_VERSION (2, 24, 0)
if (self->priv->base_gfile) {
g_object_unref (self->priv->base_gfile);
@@ -152,6 +150,8 @@ instance_dispose (GObject * instance)
}
#endif
+ g_free (self->priv);
+
rsvg_parent_class->dispose (instance);
}
--
1.7.1

View File

@ -3,7 +3,7 @@
Name: librsvg2
Summary: An SVG library based on cairo
Version: 2.31.0
Release: 0.2.%{alphatag}%{?dist}
Release: 0.3.%{alphatag}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
@ -11,6 +11,8 @@ Source: http://download.gnome.org/sources/librsvg/2.31/librsvg-%{version
# upstream fix
Patch0: rsvg-pixbuf.patch
# Reported as https://bugzilla.gnome.org/show_bug.cgi?id=623383 -- atkac
Patch1: 0001-rsvg-gobject.c-g_free-object-after-we-free-all-it-s-.patch
Requires(post): gdk-pixbuf2
Requires(postun): gdk-pixbuf2
@ -52,6 +54,7 @@ files to allow you to develop with librsvg.
%prep
%setup -q -n librsvg-%{version}
%patch0 -p1 -b .pixbuf
%patch1 -p1 -b .invalid_free
%build
GDK_PIXBUF_QUERYLOADERS=/usr/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
@ -102,6 +105,10 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
%changelog
* Fri Jul 02 2010 Adam Tkac <atkac redhat com> - 2.31.0-0.3.20100628git
- fix crash in rsvg-gobject.c:instance_dispose function
(https://bugzilla.gnome.org/show_bug.cgi?id=623383)
* Wed Jun 30 2010 Matthias Clasen <mclasen@redhat.com> - 2.31.0-0.2.20100628git
- Fix the .pc file to require gdk-pixbuf-2.0