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/shell.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'src/nvim/os/shell.c') diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 398d94b606..912dc95aca 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -293,19 +293,15 @@ int os_system(const char *cmd, if (input) { WBuffer *input_buffer = wstream_new_buffer((char *) input, len, 1, NULL); - // we want to be notified when the write completes - job_write_cb(job, system_write_cb); - if (!job_write(job, input_buffer)) { // couldn't write, stop the job and tell the user about it job_stop(job); return -1; } - } else { - // close the input stream, let the process know that no input is coming - job_close_in(job); } + // close the input stream, let the process know that no more input is coming + job_close_in(job); int status = job_wait(job, -1); // prepare the out parameters if requested @@ -353,17 +349,6 @@ static void system_data_cb(RStream *rstream, void *data, bool eof) buf->len += nread; } -static void system_write_cb(WStream *wstream, - void *data, - size_t pending, - int status) -{ - if (pending == 0) { - Job *job = data; - job_close_in(job); - } -} - /// Parses a command string into a sequence of words, taking quotes into /// consideration. /// -- cgit