From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 3 Apr 2018 10:51:01 +0000 (+0200)
Subject: patch 8.0.1657: crash when reading a channel
X-Git-Tag: v8.0.1657
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9af9778209cd0cbb284f6ff7e88f707418089975;p=vim

patch 8.0.1657: crash when reading a channel

Problem:    Crash when reading a channel.
Solution:   Clear the write flag before writing. (idea by Shinya Ohyanagi,
            closes #2769).
---

diff --git a/src/channel.c b/src/channel.c
index 3b71472fd..38e639224 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4150,8 +4150,9 @@ channel_select_check(int ret_in, void *rfds_in, void *wfds_in)
 	if (ret > 0 && in_part->ch_fd != INVALID_FD
 					    && FD_ISSET(in_part->ch_fd, wfds))
 	{
-	    channel_write_input(channel);
+	    /* Clear the flag first, ch_fd may change in channel_write_input(). */
 	    FD_CLR(in_part->ch_fd, wfds);
+	    channel_write_input(channel);
 	    --ret;
 	}
     }
diff --git a/src/version.c b/src/version.c
index 1c2d802d0..1178d9b2a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1657,
 /**/
     1656,
 /**/