From a8bfa1727a370d659dc0ccc3f0fd1763b10b5457 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 29 Dec 2018 22:28:46 +0100 Subject: 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. --- src/os_unix.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/os_unix.c') diff --git a/src/os_unix.c b/src/os_unix.c index eaf07f101..ec12f3ea7 100644 --- 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; } -- cgit v1.2.1