[gnumeric/f15] Fixed a parsing crash using a patch from upstream git (RH #726860)
belegdol
belegdol at fedoraproject.org
Sat Jul 30 14:55:02 UTC 2011
commit c57a7c6074603ac9c009c4135c644b07bc7872bf
Author: Julian Sikorski <belegdol at fedoraproject.org>
Date: Sat Jul 30 16:47:24 2011 +0200
Fixed a parsing crash using a patch from upstream git (RH #726860)
Conflicts:
gnumeric.spec
726860.patch | 25 +++++++++++++++++++++++++
gnumeric.spec | 7 ++++++-
2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/726860.patch b/726860.patch
new file mode 100644
index 0000000..0f60c84
--- /dev/null
+++ b/726860.patch
@@ -0,0 +1,25 @@
+From ddd96433413b73f7ec04a6d570f3fdcb7f53056b Mon Sep 17 00:00:00 2001
+From: Morten Welinder <terra at gnome.org>
+Date: Sat, 30 Jul 2011 10:06:33 +0000
+Subject: Parser: fix crash on ['
+
+---
+diff --git a/src/parser.y b/src/parser.y
+index d41d517..90b1ef7 100644
+--- a/src/parser.y
++++ b/src/parser.y
+@@ -1417,10 +1417,10 @@ yylex (void)
+ }
+ }
+
+- while (g_unichar_isspace (g_utf8_get_char (p)))
++ while (p && g_unichar_isspace (g_utf8_get_char (p)))
+ p = g_utf8_next_char (p);
+
+- if (s->len == 0 || p[0] != ']') {
++ if (s->len == 0 || !p || p[0] != ']') {
+ g_string_free (s, TRUE);
+ break;
+ }
+--
+cgit v0.9
diff --git a/gnumeric.spec b/gnumeric.spec
index c237760..7037a8e 100644
--- a/gnumeric.spec
+++ b/gnumeric.spec
@@ -1,7 +1,7 @@
Name: gnumeric
Epoch: 1
Version: 1.10.16
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Spreadsheet program for GNOME
Group: Applications/Productivity
# bug filed upstream about this being GPL v2 only:
@@ -9,6 +9,7 @@ Group: Applications/Productivity
License: GPLv2
URL: http://www.gnome.org/gnumeric/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.10/%{name}-%{version}.tar.xz
+Patch0: 726860.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: libgnomeui-devel >= 2.4.0
BuildRequires: libgnomeprintui22-devel >= 2.8.2
@@ -57,6 +58,7 @@ This package contains the following additional plugins for gnumeric:
%prep
%setup -q
+%patch0 -p1 -b .726860
chmod -x plugins/excel/rc4.?
@@ -184,6 +186,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%changelog
+* Sat Jul 30 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1:1.10.16-2
+- Fixed a parsing crash using a patch from upstream git (RH #726860)
+
* Sat Jun 18 2011 Julian Sikorski <belegdol at fedoraproject.org> - 1:1.10.16-1
- Updated to 0.8.16
- Switched to .xz sources
More information about the scm-commits
mailing list