1
0
forked from aniani/vim

patch 8.1.0661: clipboard regexp might be used recursively

Problem:    Clipboard regexp might be used recursively.
Solution:   Check for recursive use and bail out.
This commit is contained in:
Bram Moolenaar
2018-12-29 22:28:46 +01:00
parent 1ea88a3e12
commit a8bfa1727a
4 changed files with 19 additions and 1 deletions

View File

@@ -1688,9 +1688,15 @@ x_connect_to_server(void)
if (x_no_connect) if (x_no_connect)
return FALSE; return FALSE;
/* Check for a match with "exclude:" from 'clipboard'. */ // Check for a match with "exclude:" from 'clipboard'.
if (clip_exclude_prog != NULL) if (clip_exclude_prog != NULL)
{ {
// Just in case we get called recursively, return FALSE. This could
// happen if vpeekc() is used while executing the prog and it causes a
// related callback to be invoked.
if (regprog_in_use(clip_exclude_prog))
return FALSE;
if (vim_regexec_prog(&clip_exclude_prog, FALSE, T_NAME, (colnr_T)0)) if (vim_regexec_prog(&clip_exclude_prog, FALSE, T_NAME, (colnr_T)0))
return FALSE; return FALSE;
} }

View File

@@ -13,6 +13,7 @@ char_u *reg_submatch(int no);
list_T *reg_submatch_list(int no); list_T *reg_submatch_list(int no);
regprog_T *vim_regcomp(char_u *expr_arg, int re_flags); regprog_T *vim_regcomp(char_u *expr_arg, int re_flags);
void vim_regfree(regprog_T *prog); void vim_regfree(regprog_T *prog);
int regprog_in_use(regprog_T *prog);
int vim_regexec_prog(regprog_T **prog, int ignore_case, char_u *line, colnr_T col); int vim_regexec_prog(regprog_T **prog, int ignore_case, char_u *line, colnr_T col);
int vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col); int vim_regexec(regmatch_T *rmp, char_u *line, colnr_T col);
int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col); int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col);

View File

@@ -8209,6 +8209,15 @@ report_re_switch(char_u *pat)
} }
#endif #endif
/*
* Return whether "prog" is currently being executed.
*/
int
regprog_in_use(regprog_T *prog)
{
return prog->re_in_use;
}
/* /*
* Match a regexp against a string. * Match a regexp against a string.
* "rmp->regprog" is a compiled regexp as returned by vim_regcomp(). * "rmp->regprog" is a compiled regexp as returned by vim_regcomp().

View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
661,
/**/ /**/
660, 660,
/**/ /**/