adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.0.1081: memory leak for the channel write queue

Browse Source 
Problem:    Memory leak for the channel write queue.
Solution:   Free the write queue when clearing a channel.
This commit is contained in:
Bram Moolenaar
2017-09-09 16:42:53 +02:00
parent 74121231be
commit aba680a851
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/channel.c
View File

@ -2930,14 +2930,26 @@ channel_close_in(channel_T *channel)
ch_close_part(channel, PART_IN); ch_close_part(channel, PART_IN);
} }
static void
remove_from_writeque(writeq_T *wq, writeq_T *entry)
{
ga_clear(&entry->wq_ga);
wq->wq_next = entry->wq_next;
if (wq->wq_next == NULL)
wq->wq_prev = NULL;
else
wq->wq_next->wq_prev = NULL;
}
/* /*
* Clear the read buffer on "channel"/"part". * Clear the read buffer on "channel"/"part".
*/ */
static void static void
channel_clear_one(channel_T *channel, ch_part_T part) channel_clear_one(channel_T *channel, ch_part_T part)
{ {
jsonq_T *json_head = &channel->ch_part[part].ch_json_head; chanpart_T *ch_part = &channel->ch_part[part];
cbq_T *cb_head = &channel->ch_part[part].ch_cb_head; jsonq_T *json_head = &ch_part->ch_json_head;
cbq_T *cb_head = &ch_part->ch_cb_head;
while (channel_peek(channel, part) != NULL) while (channel_peek(channel, part) != NULL)
vim_free(channel_get(channel, part)); vim_free(channel_get(channel, part));
@ -2957,10 +2969,13 @@ channel_clear_one(channel_T *channel, ch_part_T part)
remove_json_node(json_head, json_head->jq_next); remove_json_node(json_head, json_head->jq_next);
} }
free_callback(channel->ch_part[part].ch_callback, free_callback(ch_part->ch_callback, ch_part->ch_partial);
channel->ch_part[part].ch_partial); ch_part->ch_callback = NULL;
channel->ch_part[part].ch_callback = NULL; ch_part->ch_partial = NULL;
channel->ch_part[part].ch_partial = NULL;
while (ch_part->ch_writeque.wq_next != NULL)
remove_from_writeque(&ch_part->ch_writeque,
ch_part->ch_writeque.wq_next);
} }
/* /*
@ -3719,12 +3734,7 @@ channel_send(
if (entry != NULL) if (entry != NULL)
{ {
/* Remove the entry from the write queue. */ /* Remove the entry from the write queue. */
ga_clear(&entry->wq_ga); remove_from_writeque(wq, entry);
wq->wq_next = entry->wq_next;
if (wq->wq_next == NULL)
wq->wq_prev = NULL;
else
wq->wq_next->wq_prev = NULL;
continue; continue;
} }
if (did_use_queue) if (did_use_queue)

2
src/version.c
View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1081,
/**/ /**/
1080, 1080,
/**/ /**/