diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-03-23 22:01:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-03-23 22:01:17 +0100 |
| commit | dbbb0ef729e392e313ccc63c247bff1b828a214d (patch) | |
| tree | 5ee1cf84f3f6304c1fbc9aeaf124910867aea49d | |
| parent | a8bd3496380ceb32e544dfe39cb4d52e4943068c (diff) | |
| download | vim-git-dbbb0ef729e392e313ccc63c247bff1b828a214d.tar.gz | |
patch 8.2.0435: channel contents might be freed twicev8.2.0435
Problem: Channel contents might be freed twice.
Solution: Call either channel_free_channel() or channel_free(), not both.
(Nobuhiro Takasaki, closes #5835)
| -rw-r--r-- | src/channel.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 435, +/**/ 434, /**/ 433, |