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.
This commit is contained in:
Thiago de Arruda
2014-10-01 20:19:10 -03:00
parent ba1026c2c7
commit 45525853d3
3 changed files with 4 additions and 22 deletions

View File

@@ -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);