From 8df472a4e0d292f7b5c93dc0c478528e632f057c Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Thu, 29 May 2008 09:07:43 +0000
Subject: [PATCH] - Resolves: #447428 aspell sigserv on checking file with 0
 length

---
 aspell-0.60.6-zero.patch | 11 +++++++++++
 aspell.spec              |  8 +++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 aspell-0.60.6-zero.patch

diff --git a/aspell-0.60.6-zero.patch b/aspell-0.60.6-zero.patch
new file mode 100644
index 0000000..926abfd
--- /dev/null
+++ b/aspell-0.60.6-zero.patch
@@ -0,0 +1,11 @@
+diff -up aspell-0.60.6/common/convert.cpp.zero aspell-0.60.6/common/convert.cpp
+--- aspell-0.60.6/common/convert.cpp.zero	2007-12-03 07:55:45.000000000 +0100
++++ aspell-0.60.6/common/convert.cpp	2008-05-29 10:51:39.000000000 +0200
+@@ -813,6 +813,7 @@ namespace acommon {
+   {
+     ToUniLookup lookup;
+     void decode(const char * in, int size, FilterCharVector & out) const {
++      if (size == 0) return; // if size == 0 then while loop cause SIGSEGV
+       const char * stop = in + size; // this is OK even if size == -1
+       while (*in && in != stop) {
+         out.append(from_utf8(in, stop));
diff --git a/aspell.spec b/aspell.spec
index 8d18680..c30a0f4 100644
--- a/aspell.spec
+++ b/aspell.spec
@@ -1,7 +1,7 @@
 Summary: A spelling checker
 Name: aspell
 Version: 0.60.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 12
 License: LGPLv2 and MIT
 Group: Applications/Text
@@ -11,6 +11,7 @@ Patch1: aspell-0.50.3-gcc33.patch
 Patch3: aspell-0.60.3-install_info.patch
 Patch5: aspell-0.60.5-fileconflict.patch
 Patch7: aspell-0.60.5-pspell_conf.patch
+Patch8: aspell-0.60.6-zero.patch
 Requires: aspell-en
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext, ncurses-devel, pkgconfig
@@ -52,6 +53,7 @@ static libraries and header files needed for Aspell development.
 %patch3 -p1 -b .iinfo
 %patch5 -p1 -b .fc
 %patch7 -p1 -b .mlib
+%patch8 -p1 -b .zero
 iconv -f windows-1252 -t utf-8 manual/aspell.info -o manual/aspell.info.aux
 mv manual/aspell.info.aux manual/aspell.info
 
@@ -129,6 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pspell-config.1*
 
 %changelog
+* Thu May 29 2008 Ivana Varekova <varekova@redhat.com> - 12:0.60.6-2
+- Resolves: #447428
+  aspell sigserv on checking file with 0 length
+
 * Wed May  7 2008 Ivana Varekova <varekova@redhat.com> - 12:0.60.6-1
 - update to 0.60.6