# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1585235703 -3600
# Node ID f46d3a9fe27d85ccbbec167659901a6554efb6ab
# Parent  db735aadbcc27aa846ef29d79da8fbfad65ed970
patch 8.2.0452: channel_parse_messages() fails when called recursively

Commit: https://github.com/vim/vim/commit/a9c3a30891edd7347d94298c48ea68bb5c165fd7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Mar 26 16:03:45 2020 +0100

    patch 8.2.0452: channel_parse_messages() fails when called recursively

    Problem:    channel_parse_messages() fails when called recursively.
    Solution:   Return for a recursive call. (closes https://github.com/vim/vim/issues/5835)

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -4428,14 +4428,22 @@ channel_parse_messages(void)
     int		ret = FALSE;
     int		r;
     ch_part_T	part = PART_SOCK;
+    static int	recursive = FALSE;
 #ifdef ELAPSED_FUNC
     elapsed_T	start_tv;
-
+#endif
+
+    // The code below may invoke callbacks, which might call us back.
+    // That doesn't work well, just return without doing anything.
+    if (recursive)
+	return FALSE;
+    recursive = TRUE;
+    ++safe_to_invoke_callback;
+
+#ifdef ELAPSED_FUNC
     ELAPSED_INIT(start_tv);
 #endif
 
-    ++safe_to_invoke_callback;
-
     // Only do this message when another message was given, otherwise we get
     // lots of them.
     if ((did_repeated_msg & REPEATED_MSG_LOOKING) == 0)
@@ -4513,6 +4521,7 @@ channel_parse_messages(void)
     }
 
     --safe_to_invoke_callback;
+    recursive = FALSE;
 
     return ret;
 }
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    452,
+/**/
     451,
 /**/
     450,