summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaszlo Nemeth <nemeth@openoffice.org>2011-01-06 23:48:55 +0100
committerAndras Timar <timar@fsf.hu>2011-01-06 23:48:55 +0100
commitfcf118007512b5f311b8786e8d381875bfe48a55 (patch)
tree33c98bd7cedb65bf902ae555bab4434d7a545e27
parenteedd0cf67771f3169f6b5095deca82922c8c6544 (diff)
fixed a crash - fdo#32850
-rw-r--r--hunspell/hunspell-1.2.9-crashfix.patch11
-rw-r--r--hunspell/makefile.mk3
2 files changed, 13 insertions, 1 deletions
diff --git a/hunspell/hunspell-1.2.9-crashfix.patch b/hunspell/hunspell-1.2.9-crashfix.patch
new file mode 100644
index 000000000000..73244d21a99b
--- /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 ded4bb691abb..a61f4e596e16 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -44,7 +44,8 @@ PATCH_FILES=\
hunspell-wntconfig.patch \
hunspell-solaris.patch \
hunspell-stacksmash.patch \
- hunspell-valgrind.patch
+ hunspell-valgrind.patch \
+ hunspell-1.2.9-crashfix.patch
.IF "$(GUI)"=="UNX"