# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1546119005 -3600
# Node ID 7fff2d18e1919218313008c723dd8b43851d9168
# Parent  79d2bc5fa18ddb9a87fbbed6720f738590fe9edc
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.

diff --git a/src/os_unix.c b/src/os_unix.c
--- 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;
     }
diff --git a/src/proto/regexp.pro b/src/proto/regexp.pro
--- 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);
diff --git a/src/regexp.c b/src/regexp.c
--- 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.
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    661,
+/**/
     660,
 /**/
     659,