neovim

commit bdd14d03c7711e11c00cf81b417e869ecd10a3b0
parent 4c127f107a0c930878b4a28dd96c41c505127b5d
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue, 17 Jan 2023 12:23:49 +0800

vim-patch:8.2.4477: crash when using fuzzy completion

Problem:    Crash when using fuzzy completion.
Solution:   Temporary fix: put back regexp. (closes vim/vim#9851)

https://github.com/vim/vim/commit/29ab6ce9f36660cffaad3c8789e71162e5db5d2f

Co-authored-by: Bram Moolenaar <Bram@vim.org>

Diffstat:
M
src/nvim/cmdexpand.c
 | 
19
+++++++------------

1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/nvim/cmdexpand.c b/src/nvim/cmdexpand.c
@@ -2636,7 +2636,6 @@ static int ExpandFromContext(expand_T *xp, char *pat, char ***matches, int *numM
   regmatch_T regmatch = { .rm_ic = false };
   int ret;
   int flags = map_wildopts_to_ewflags(options);
-  const bool fuzzy = cmdline_fuzzy_complete(pat);
 
   if (xp->xp_context == EXPAND_FILES
       || xp->xp_context == EXPAND_DIRECTORIES
@@ -2717,16 +2716,14 @@ static int ExpandFromContext(expand_T *xp, char *pat, char ***matches, int *numM
     return nlua_expand_pat(xp, pat, numMatches, matches);
   }
 
-  if (!fuzzy) {
-    regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
-    if (regmatch.regprog == NULL) {
-      return FAIL;
-    }
-
-    // set ignore-case according to p_ic, p_scs and pat
-    regmatch.rm_ic = ignorecase(pat);
+  regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
+  if (regmatch.regprog == NULL) {
+    return FAIL;
   }
 
+  // set ignore-case according to p_ic, p_scs and pat
+  regmatch.rm_ic = ignorecase(pat);
+
   if (xp->xp_context == EXPAND_SETTINGS
       || xp->xp_context == EXPAND_BOOL_SETTINGS) {
     ret = ExpandSettings(xp, &regmatch, pat, numMatches, matches);
@@ -2738,9 +2735,7 @@ static int ExpandFromContext(expand_T *xp, char *pat, char ***matches, int *numM
     ret = ExpandOther(pat, xp, &regmatch, matches, numMatches);
   }
 
-  if (!fuzzy) {
-    vim_regfree(regmatch.regprog);
-  }
+  vim_regfree(regmatch.regprog);
   xfree(tofree);
 
   return ret;