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.
diff --git a/src/os_unix.c b/src/os_unix.c
index eaf07f1..ec12f3e 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1688,9 +1688,15 @@
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;
}
diff --git a/src/proto/regexp.pro b/src/proto/regexp.pro
index d22a83b..a33fdd9 100644
--- a/src/proto/regexp.pro
+++ b/src/proto/regexp.pro
@@ -13,6 +13,7 @@
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);
diff --git a/src/regexp.c b/src/regexp.c
index 011ee2d..e055dd3 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -8210,6 +8210,15 @@
#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.
diff --git a/src/version.c b/src/version.c
index c98fc50..c49e869 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 661,
+/**/
660,
/**/
659,