IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

rstream.c: Prevent stream closing if a read event is still queued. #3172

Browse Source 
Processing a stream's output can be queued. If stream_close() is called
before the queue is processed, the RBuffer containing the stream's data
is freed and the next read event would try to access freed memory.

To fix this behavior, use the stream's pending requests counter.
This commit is contained in:
oni-link 2015-08-15 11:36:14 +02:00 committed by Justin M. Keyes
parent 2bd3351c37
commit db7b970057
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/event/rstream.c
View File

@ -177,10 +177,25 @@ static void read_event(void **argv)
bool eof = (uintptr_t)argv[2];
stream->read_cb(stream, stream->buffer, count, stream->data, eof);
}
stream->pending_reqs--;
if (stream->closed && !stream->pending_reqs) {
stream_close_handle(stream);
}
}
static void invoke_read_cb(Stream *stream, size_t count, bool eof)
{
CREATE_EVENT(stream->events, read_event, 3, stream,
(void *)(uintptr_t *)count, (void *)(uintptr_t)eof);
if (stream->closed) {
return;
}
// Don't let the stream be closed before the event is processed.
stream->pending_reqs++;
CREATE_EVENT(stream->events,
read_event,
3,
stream,
(void *)(uintptr_t *)count,
(void *)(uintptr_t)eof);
}