[Libreoffice-commits] .: Branch 'libreoffice-3-3' - hunspell/hunspell-1.2.9-crashfix.patch hunspell/makefile.mk

[Caolán McNamara]

 hunspell/hunspell-1.2.9-crashfix.patch |   11 +++++++++++
 hunspell/makefile.mk                   |    3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 12a7f97c8c3e28135c1eb8f5257277f4486180b1
Author: Laszlo Nemeth <nemeth at openoffice.org>
Date:   Thu Jan 6 23:48:55 2011 +0100

    fixed a crash - fdo#32850

diff --git a/hunspell/hunspell-1.2.9-crashfix.patch b/hunspell/hunspell-1.2.9-crashfix.patch
new file mode 100644
index 0000000..73244d2
--- /dev/null
+++ b/hunspell/hunspell-1.2.9-crashfix.patch
@@ -0,0 +1,11 @@
+--- misc/hunspell-1.2.9/src/hunspell/affixmgr.cxx	2010-02-27 12:59:53.000000000 +0100
++++ misc/build/hunspell-1.2.9/src/hunspell/affixmgr.cxx	2011-01-06 16:18:23.361159724 +0100
+@@ -1542,7 +1542,7 @@
+         }
+ 
+         if (!rv) {
+-            if (compoundflag && 
++            if (compoundflag && !words && 
+              !(rv = prefix_check(st, i, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN, compoundflag))) {
+                 if ((rv = suffix_check(st, i, 0, NULL, NULL, 0, NULL,
+                         FLAG_NULL, compoundflag, hu_mov_rule ? IN_CPD_OTHER : IN_CPD_BEGIN)) && !hu_mov_rule &&
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index a455cce..7868089 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -43,7 +43,8 @@ ADDITIONAL_FILES+=config.h
 PATCH_FILES=\
     hunspell-wntconfig.patch \
     hunspell-solaris.patch \
-    hunspell-stacksmash.patch
+    hunspell-stacksmash.patch \
+    hunspell-1.2.9-crashfix.patch
 
 .IF "$(GUI)"=="UNX"