summaryrefslogtreecommitdiff
path: root/hunspell
diff options
context:
space:
mode:
authorLaszlo Nemeth <nemeth@openoffice.org>2011-01-06 23:48:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-01-07 09:27:51 +0000
commitee8a47bfbb40932a6f29d9c2dad8796bf9570441 (patch)
tree2abab59c708a79a43fba0a2ae13db74a7d635d33 /hunspell
parent9a066526c54171f97836d4aa650021ef518a2f8d (diff)
fixed a crash - fdo#32850
Diffstat (limited to 'hunspell')
-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 a455cce62388..78680892edc9 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"