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

wstream: Refactor buffer memory management

Browse Source 
- Extract code to release WBuffer instances into `release_wbuffer`
- Fix memory leak when wstream_write returns false
This commit is contained in:
Thiago de Arruda 2014-06-20 10:37:04 -03:00
parent 0fd46ae8f0
commit 11916b6b59
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/os/wstream.c
View File

@ -91,11 +91,13 @@ bool wstream_write(WStream *wstream, WBuffer *buffer)
// This should not be called after a wstream was freed
assert(!wstream->freed);
buffer->refcount++;
if (wstream->curmem > wstream->maxmem) {
release_wbuffer(buffer);
return false;
}
buffer->refcount++;
wstream->curmem += buffer->size;
data = xmalloc(sizeof(WriteData));
data->wstream = wstream;
@ -138,10 +140,7 @@ static void write_cb(uv_write_t *req, int status)
free(req);
data->wstream->curmem -= data->buffer->size;
if (!--data->buffer->refcount) {
data->buffer->cb(data->buffer->data);
free(data->buffer);
}
release_wbuffer(data->buffer);
data->wstream->pending_reqs--;
if (data->wstream->freed && data->wstream->pending_reqs == 0) {
@ -152,3 +151,10 @@ static void write_cb(uv_write_t *req, int status)
free(data);
}
static void release_wbuffer(WBuffer *buffer)
{
if (!--buffer->refcount) {
buffer->cb(buffer->data);
free(buffer);
}
}