From 29ab6ce9f36660cffaad3c8789e71162e5db5d2f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 26 Feb 2022 15:52:08 +0000 Subject: patch 8.2.4477: crash when using fuzzy completion Problem: Crash when using fuzzy completion. Solution: Temporary fix: put back regexp. (closes #9851) --- src/cmdexpand.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'src/cmdexpand.c') diff --git a/src/cmdexpand.c b/src/cmdexpand.c index 138ff9ef81..dd8bc06d09 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -2370,7 +2370,7 @@ get_mapclear_arg(expand_T *xp UNUSED, int idx) static int ExpandOther( char_u *pat, - expand_T *xp, + expand_T *xp, regmatch_T *rmp, char_u ***matches, int *numMatches) @@ -2496,7 +2496,6 @@ ExpandFromContext( int ret; int flags; char_u *tofree = NULL; - int fuzzy = cmdline_fuzzy_complete(pat); flags = map_wildopts_to_ewflags(options); @@ -2581,15 +2580,12 @@ ExpandFromContext( pat = tofree; } - if (!fuzzy) - { - regmatch.regprog = vim_regcomp(pat, magic_isset() ? RE_MAGIC : 0); - if (regmatch.regprog == NULL) - return FAIL; + 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) @@ -2603,8 +2599,7 @@ ExpandFromContext( else ret = ExpandOther(pat, xp, ®match, matches, numMatches); - if (!fuzzy) - vim_regfree(regmatch.regprog); + vim_regfree(regmatch.regprog); vim_free(tofree); return ret; -- cgit v1.2.3