summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-02-10 20:03:45 +0100
committerBram Moolenaar <Bram@vim.org>2015-02-10 20:03:45 +0100
commit98f52500b6bca75539f50ea31cb333223141dfeb (patch)
treec7093517b6ff6aae4b4a8b50c3bf905d1b30e9e9
parent8872ef1b4e1b304cc168ea4c8f68645498c155be (diff)
downloadvim-git-98f52500b6bca75539f50ea31cb333223141dfeb.tar.gz
updated for version 7.4.629v7.4.629
Problem: Coverity warning for Out-of-bounds read. Solution: Increase MAXWLEN to 254. (Eliseo Martínez)
-rw-r--r--src/spell.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/spell.c b/src/spell.c
index 9d7f933a2..31bfa952f 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -311,9 +311,10 @@
# include <time.h> /* for time_t */
#endif
-#define MAXWLEN 250 /* Assume max. word len is this many bytes.
+#define MAXWLEN 254 /* Assume max. word len is this many bytes.
Some places assume a word length fits in a
- byte, thus it can't be above 255. */
+ byte, thus it can't be above 255.
+ Must be >= PFD_NOTSPECIAL. */
/* Type used for indexes in the word tree need to be at least 4 bytes. If int
* is 8 bytes we could use something smaller, but what? */
diff --git a/src/version.c b/src/version.c
index ce0b57bf3..c0684b09b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 629,
+/**/
628,
/**/
627,