summaryrefslogtreecommitdiff
path: root/src/cmdexpand.c
diff options
context:
space:
mode:
authorYegappan Lakshmanan <yegappan@yahoo.com>2022-02-26 16:05:08 +0000
committerBram Moolenaar <Bram@vim.org>2022-02-26 16:05:08 +0000
commit00333cb3b341499df8729b9345f0bbad968cda0b (patch)
treeffdecfb922771c58e3c631415a62d828bcc87e36 /src/cmdexpand.c
parent29ab6ce9f36660cffaad3c8789e71162e5db5d2f (diff)
downloadvim-git-00333cb3b341499df8729b9345f0bbad968cda0b.tar.gz
patch 8.2.4478: crash when using fuzzy completionv8.2.4478
Problem: Crash when using fuzzy completion. Solution: Temporary fix: put back regexp. (closes #9852, closes #9851)
Diffstat (limited to 'src/cmdexpand.c')
-rw-r--r--src/cmdexpand.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/cmdexpand.c b/src/cmdexpand.c
index dd8bc06d0..003f6daf1 100644
--- a/src/cmdexpand.c
+++ b/src/cmdexpand.c
@@ -2496,6 +2496,8 @@ ExpandFromContext(
int ret;
int flags;
char_u *tofree = NULL;
+ int fuzzy = cmdline_fuzzy_complete(pat)
+ && cmdline_fuzzy_completion_supported(xp);
flags = map_wildopts_to_ewflags(options);
@@ -2580,12 +2582,15 @@ ExpandFromContext(
pat = tofree;
}
- regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0);
- if (regmatch.regprog == NULL)
- return FAIL;
+ 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);
+ // 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)
@@ -2599,7 +2604,8 @@ ExpandFromContext(
else
ret = ExpandOther(pat, xp, &regmatch, matches, numMatches);
- vim_regfree(regmatch.regprog);
+ if (!fuzzy)
+ vim_regfree(regmatch.regprog);
vim_free(tofree);
return ret;