From dd9dc7ae872758bc41b3016487592725daf8fc9e Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Tue, 10 May 2016 21:24:57 +0200
Subject: vim-patch:7.4.1054

Problem:    Illegal memory access.
Solution:   Check for missing pattern. (Dominique Pelle)

https://github.com/vim/vim/commit/2795e21eaafaeaf95a91667fd411023280d0f902
---
 src/nvim/syntax.c  | 4 ++++
 src/nvim/version.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 41af7af55c..c3742786c9 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -5004,6 +5004,10 @@ static void syn_cmd_sync(exarg_T *eap, int syncing)
         curwin->w_s->b_syn_sync_maxlines = 0;
       }
     } 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"));
         finished = TRUE;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 81137ff1c6..0cb9bd304b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -624,7 +624,7 @@ static int included_patches[] = {
   // 1057,
   // 1056,
   1055,
-  // 1054,
+  1054,
   // 1053,
   // 1052,
   // 1051,
-- 
cgit