summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-08-11 15:27:13 +0200
committerBram Moolenaar <Bram@vim.org>2015-08-11 15:27:13 +0200
commit382197865ca8353a3d6681a364f95bda6aed95ec (patch)
tree8e8eae5eca9b1d252c002f72390f47fede1572ae
parentdbd24b59678dd976b2ad356451e248a6e8b8bd8b (diff)
patch 7.4.814v7.4.814
Problem: Illegal memory access with "sy match a fold". Solution: Check for empty string. (Dominique Pelle)
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 6900d573db..000d5984cc 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5654,7 +5654,7 @@ get_syn_pattern(arg, ci)
char_u *cpo_save;
/* need at least three chars */
- if (arg == NULL || arg[1] == NUL || arg[2] == NUL)
+ if (arg == NULL || arg[0] == NUL || arg[1] == NUL || arg[2] == NUL)
return NULL;
end = skip_regexp(arg + 1, *arg, TRUE, NULL);
diff --git a/src/version.c b/src/version.c
index 862759c15b..53fa03dd1b 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 */
/**/
+ 814,
+/**/
813,
/**/
812,