summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-05 22:04:49 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-05 22:04:49 +0100
commit2795e21eaafaeaf95a91667fd411023280d0f902 (patch)
tree84bc697eb1e165249a127e44dc734876302c6104
parentda59dd5da6440c3410866ed61ce169a2012ba5bd (diff)
patch 7.4.1054v7.4.1054
Problem: Illegal memory access. Solution: Check for missing pattern. (Dominique Pelle)
-rw-r--r--src/syntax.c5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 937fbf1860..badb226428 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5833,6 +5833,11 @@ syn_cmd_sync(eap, syncing)
}
else if (STRCMP(key, "LINECONT") == 0)
{
+ if (*next_arg == NUL) /* missing pattern */
+ {
+ illegal = TRUE;
+ break;
+ }
if (curwin->w_s->b_syn_linecont_pat != NULL)
{
EMSG(_("E403: syntax sync: line continuations pattern specified twice"));
diff --git a/src/version.c b/src/version.c
index 6cb4c8dbe6..23f9ed0168 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 */
/**/
+ 1054,
+/**/
1053,
/**/
1052,