From dbbb0ef729e392e313ccc63c247bff1b828a214d Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 23 Mar 2020 22:01:17 +0100 Subject: [PATCH] patch 8.2.0435: channel contents might be freed twice Problem: Channel contents might be freed twice. Solution: Call either channel_free_channel() or channel_free(), not both. (Nobuhiro Takasaki, closes #5835) --- src/channel.c | 4 +++- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/channel.c b/src/channel.c index d5240fc25..6dde107bf 100644 --- a/src/channel.c +++ b/src/channel.c @@ -4457,9 +4457,11 @@ channel_parse_messages(void) if (channel->ch_killing) { channel_free_contents(channel); + channel_free_channel(channel); channel->ch_job->jv_channel = NULL; } - channel_free(channel); + else + channel_free(channel); // channel has been freed, start over channel = first_channel; continue; diff --git a/src/version.c b/src/version.c index 6df87b45d..738f31b3c 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 435, /**/ 434, /**/ -- 2.40.0