Mercurial > vim
changeset 15306:7fff2d18e191 v8.1.0661
patch 8.1.0661: clipboard regexp might be used recursively
commit https://github.com/vim/vim/commit/a8bfa1727a370d659dc0ccc3f0fd1763b10b5457
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Dec 29 22:28:46 2018 +0100
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.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 29 Dec 2018 22:30:05 +0100 |
| parents | 79d2bc5fa18d |
| children | 813102a1eca0 |
| files | src/os_unix.c src/proto/regexp.pro src/regexp.c src/version.c |
| diffstat | 4 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -1688,9 +1688,15 @@ x_connect_to_server(void) if (x_no_connect) return FALSE; - /* Check for a match with "exclude:" from 'clipboard'. */ + // Check for a match with "exclude:" from 'clipboard'. 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)) return FALSE; }
--- a/src/proto/regexp.pro +++ b/src/proto/regexp.pro @@ -13,6 +13,7 @@ char_u *reg_submatch(int no); list_T *reg_submatch_list(int no); regprog_T *vim_regcomp(char_u *expr_arg, int re_flags); 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(regmatch_T *rmp, char_u *line, colnr_T col); int vim_regexec_nl(regmatch_T *rmp, char_u *line, colnr_T col);
--- a/src/regexp.c +++ b/src/regexp.c @@ -8210,6 +8210,15 @@ report_re_switch(char_u *pat) #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. * "rmp->regprog" is a compiled regexp as returned by vim_regcomp(). * Note: "rmp->regprog" may be freed and changed.