Fix a crash
This commit is contained in:
parent
44a69312d0
commit
73c2aab73a
@ -0,0 +1,30 @@
|
|||||||
|
From 197a8fe3b15d01893ab0d1cd64e23dfeb7ca75a9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Matthias Clasen <mclasen@redhat.com>
|
||||||
|
Date: Fri, 18 Feb 2011 17:27:26 -0500
|
||||||
|
Subject: [PATCH] Don't accidentally return NULL from parse_style_value()
|
||||||
|
|
||||||
|
Callers don't expect it and things go bad...
|
||||||
|
https://bugzilla.gnome.org/show_bug.cgi?id=626802
|
||||||
|
---
|
||||||
|
rsvg-styles.c | 5 ++++-
|
||||||
|
1 files changed, 4 insertions(+), 1 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/rsvg-styles.c b/rsvg-styles.c
|
||||||
|
index bd59a10..7498ec9 100644
|
||||||
|
--- a/rsvg-styles.c
|
||||||
|
+++ b/rsvg-styles.c
|
||||||
|
@@ -887,7 +887,10 @@ parse_style_value (const gchar *string, gchar **value, gboolean *important)
|
||||||
|
} else {
|
||||||
|
*important = FALSE;
|
||||||
|
}
|
||||||
|
- *value = g_strdup (g_strstrip (strings[0]));
|
||||||
|
+ if (strings[0])
|
||||||
|
+ *value = g_strdup (g_strstrip (strings[0]));
|
||||||
|
+ else
|
||||||
|
+ *value = g_strdup ("");
|
||||||
|
|
||||||
|
g_strfreev (strings);
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.4.1
|
||||||
|
|
@ -7,6 +7,9 @@ License: LGPLv2+
|
|||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
#VCS: git:git://git.gnome.org/librsvg
|
#VCS: git:git://git.gnome.org/librsvg
|
||||||
Source: http://download.gnome.org/sources/librsvg/2.32/librsvg-%{version}.tar.bz2
|
Source: http://download.gnome.org/sources/librsvg/2.32/librsvg-%{version}.tar.bz2
|
||||||
|
# upstream fix
|
||||||
|
Patch0: 0001-Don-t-accidentally-return-NULL-from-parse_style_valu.patch
|
||||||
|
|
||||||
|
|
||||||
Requires(post): gdk-pixbuf2
|
Requires(post): gdk-pixbuf2
|
||||||
Requires(postun): gdk-pixbuf2
|
Requires(postun): gdk-pixbuf2
|
||||||
@ -45,6 +48,7 @@ files to allow you to develop with librsvg.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n librsvg-%{version}
|
%setup -q -n librsvg-%{version}
|
||||||
|
%patch0 -p1 -b .null-crash
|
||||||
|
|
||||||
%build
|
%build
|
||||||
GDK_PIXBUF_QUERYLOADERS=/usr/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
|
GDK_PIXBUF_QUERYLOADERS=/usr/bin/gdk-pixbuf-query-loaders-%{__isa_bits}
|
||||||
@ -95,6 +99,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 18 2011 Matthias Clasen <mclasen@redhat.com> - 2.32.1-3
|
||||||
|
- Fix a crash (#603183)
|
||||||
|
|
||||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.32.1-2
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.32.1-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user