vim-patch:7.4.421

Problem:    Crash when searching for "\ze*". (Urtica Dioica)
Solution:   Disallow a multi after \ze and \zs.

https://code.google.com/p/vim/source/detail?r=v7-4-421

1 files changed, 16 insertions, 1 deletions

diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 2659eac762..bbe96854ad 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -1259,10 +1259,16 @@ static int nfa_regatom(void)
     switch (c) {
     case 's':
       EMIT(NFA_ZSTART);
+      if (!re_mult_next("\\zs")) {
+        return false;
+      }
       break;
     case 'e':
       EMIT(NFA_ZEND);
-      nfa_has_zend = TRUE;
+      nfa_has_zend = true;
+      if (!re_mult_next("\\zs")) {
+        return false;
+      }
       break;
     case '1':
     case '2':
@@ -1741,6 +1747,15 @@ nfa_do_multibyte:
   return OK;
 }
 
+/// Used in a place where no * or \+ can follow.
+static bool re_mult_next(char *what)
+{
+  if (re_multi_type(peekchr()) == MULTI_MULT) {
+    EMSG2_RET_FAIL(_("E888: (NFA regexp) cannot repeat %s"), what);
+  }
+  return true;
+}
+
 /*
  * Parse something followed by possible [*+=].
  *