summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-11 15:54:00 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-11 15:54:00 +0100
commit5fd8b78214a52b561780eb5ba000b1a3f5ba1d3d (patch)
treece77a681acf5a5a2abee9392a3f1781a3b85d5ce
parentd09a206ee94ccb653707ce9b6e536d4d58886e04 (diff)
patch 8.0.1286: occasional crash when using a channelv8.0.1286
Problem: Occasional crash when using a channel. (Marek) Solution: Decrement reference count later. (closes #2315)
-rw-r--r--src/channel.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/channel.c b/src/channel.c
index 606c66a869..8fc705058a 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -2898,8 +2898,6 @@ channel_close(channel_T *channel, int invoke_close_cb)
channel->ch_close_cb = NULL;
channel->ch_close_partial = NULL;
- --channel->ch_refcount;
-
if (channel_need_redraw)
{
channel_need_redraw = FALSE;
@@ -2910,6 +2908,8 @@ channel_close(channel_T *channel, int invoke_close_cb)
/* any remaining messages are useless now */
for (part = PART_SOCK; part < PART_IN; ++part)
drop_messages(channel, part);
+
+ --channel->ch_refcount;
}
}
diff --git a/src/version.c b/src/version.c
index 8dd72301c7..4368138d19 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 */
/**/
+ 1286,
+/**/
1285,
/**/
1284,