From 45525853d3521e73512f68bb390aae0e385ef66c Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Wed, 1 Oct 2014 20:19:10 -0300 Subject: wstream/shell: Fix memory errors caused by os_system The os_system function uses a write callback to close the input stream when the write completes, but this causes a memory error because the callback is invoked right before the stream is freed by the caller. This fixes the problem by removing the callback set by os_system. Instead, it calls job_close_in immediately after writing(the stream will only close after the write completes). The 'pending' parameter was also removed from the 'write_cb' as it should be hidden by the wstream module. While the `wstream_set_write_cb` and `job_write_cb` are no longer used, they will remain in the codebase for future use. --- src/nvim/os/wstream.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/nvim/os/wstream.c') diff --git a/src/nvim/os/wstream.c b/src/nvim/os/wstream.c index 00a53d1628..eb7de02a2f 100644 --- a/src/nvim/os/wstream.c +++ b/src/nvim/os/wstream.c @@ -208,15 +208,14 @@ static void write_cb(uv_write_t *req, int status) release_wbuffer(data->buffer); - data->wstream->pending_reqs--; - if (data->wstream->cb) { data->wstream->cb(data->wstream, data->wstream->data, - data->wstream->pending_reqs, status); } + data->wstream->pending_reqs--; + if (data->wstream->freed && data->wstream->pending_reqs == 0) { // Last pending write, free the wstream; free(data->wstream); -- cgit