summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/syntax.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/syntax.c b/src/syntax.c
index 6bbe4bacc..ccdb2030c 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -5764,6 +5764,8 @@ syn_cmd_sync(exarg_T *eap, int syncing UNUSED)
next_arg = skipwhite(arg_end);
vim_free(key);
key = vim_strnsave_up(arg_start, arg_end - arg_start);
+ if (key == NULL)
+ break;
if (STRCMP(key, "CCOMMENT") == 0)
{
if (!eap->skip)
diff --git a/src/version.c b/src/version.c
index 73d456001..c13f7f18f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1171,
+/**/
1170,
/**/
1169,