From 5d15954fe852fbcfc7a657881fc82cc1b5b8fcee Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: May 29 2008 09:29:49 +0000
Subject: - Resolves: #447428 aspell sigserv on checking file with 0 length


---

diff --git a/aspell-0.60.5-zero.patch b/aspell-0.60.5-zero.patch
new file mode 100644
index 0000000..475fea5
--- /dev/null
+++ b/aspell-0.60.5-zero.patch
@@ -0,0 +1,11 @@
+diff -up aspell-0.60.5/common/convert.cpp.pom aspell-0.60.5/common/convert.cpp
+--- aspell-0.60.5/common/convert.cpp.pom	2006-11-18 09:36:01.000000000 +0100
++++ aspell-0.60.5/common/convert.cpp	2008-05-29 11:25:25.000000000 +0200
+@@ -821,6 +821,7 @@ namespace acommon {
+     PosibErr<void> decode_ec(const char * in, int size, 
+                              FilterCharVector & out, ParmStr orig) const {
+       const char * begin = in;
++      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) {
+         FilterChar c = from_utf8(in, stop, (Uni32)-1);
diff --git a/aspell.spec b/aspell.spec
index 76c6ee2..64ac47b 100644
--- a/aspell.spec
+++ b/aspell.spec
@@ -1,7 +1,7 @@
 Summary: A spelling checker
 Name: aspell
 Version: 0.60.5
-Release: 3%{?dist} 
+Release: 4%{?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.5-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.5-4
+- Resolves: #447428
+  aspell sigserv on checking file with 0 length
+
 * Thu Feb  8 2007 Ivana Varekova <varekova@redhat.com> - 12:0.60.5-3
 - incorporate package review feedback