From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 13 Aug 2015 20:53:29 +0000 (+0200)
Subject: patch 7.4.825
X-Git-Tag: v7.4.825
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1560d07045d416d0abf9731c43c28925f61515b6;p=vim

patch 7.4.825
Problem:    Invalid memory access for ":syn keyword x a[".
Solution:   Do not skip over the NUL. (Dominique Pelle)
---

diff --git a/src/syntax.c b/src/syntax.c
index e4ae0b1ae..c28a24c5c 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -4873,11 +4873,16 @@ syn_cmd_keyword(eap, syncing)
 			if (p[1] == NUL)
 			{
 			    EMSG2(_("E789: Missing ']': %s"), kw);
-			    kw = p + 2;		/* skip over the NUL */
-			    break;
+			    goto error;
 			}
 			if (p[1] == ']')
 			{
+			    if (p[2] != NUL)
+			    {
+				EMSG3(_("E890: trailing char after ']': %s]%s"),
+								kw, &p[2]);
+				goto error;
+			    }
 			    kw = p + 1;		/* skip over the "]" */
 			    break;
 			}
@@ -4898,7 +4903,7 @@ syn_cmd_keyword(eap, syncing)
 		    }
 		}
 	    }
-
+error:
 	    vim_free(keyword_copy);
 	    vim_free(syn_opt_arg.cont_in_list);
 	    vim_free(syn_opt_arg.next_list);
diff --git a/src/version.c b/src/version.c
index da75ff162..fd9bf1878 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    825,
 /**/
     824,
 /**/