xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fifo reading not handling potential errors from the read call

Browse Source 
Fixes #1153
This commit is contained in:
Maxime Coste 2017-01-25 13:55:20 +00:00
parent aa7241067e
commit 125c8b7e80
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/buffer_utils.cc
View File

@ -128,19 +128,23 @@ Buffer* create_fifo_buffer(String name, int fd, bool scroll)
size_t loops = 16; size_t loops = 16;
char data[buffer_size]; char data[buffer_size];
const int fifo = watcher.fd(); const int fifo = watcher.fd();
ssize_t count = 0;
do do
{ {
count = ::read(fifo, data, buffer_size); const ssize_t count = ::read(fifo, data, buffer_size);
auto pos = buffer->back_coord(); if (count <= 0)
{
buffer->values().erase(fifo_watcher_id); // will delete this
return;
}
auto pos = buffer->back_coord();
const bool prevent_scrolling = pos == BufferCoord{0,0} and not scroll; const bool prevent_scrolling = pos == BufferCoord{0,0} and not scroll;
if (prevent_scrolling) if (prevent_scrolling)
pos = buffer->next(pos); pos = buffer->next(pos);
buffer->insert(pos, StringView(data, data+count)); buffer->insert(pos, StringView(data, data+count));
if (count > 0 and prevent_scrolling) if (prevent_scrolling)
{ {
buffer->erase({0,0}, buffer->next({0,0})); buffer->erase({0,0}, buffer->next({0,0}));
// in the other case, the buffer will have automatically // in the other case, the buffer will have automatically
@ -149,12 +153,9 @@ Buffer* create_fifo_buffer(String name, int fd, bool scroll)
buffer->insert(buffer->end_coord(), "\n"); buffer->insert(buffer->end_coord(), "\n");
} }
} }
while (--loops and count > 0 and fd_readable(fifo)); while (--loops and fd_readable(fifo));
buffer->run_hook_in_own_context("BufReadFifo", buffer->name()); buffer->run_hook_in_own_context("BufReadFifo", buffer->name());
if (count <= 0)
buffer->values().erase(fifo_watcher_id); // will delete this
}), std::move(watcher_deleter)); }), std::move(watcher_deleter));
buffer->values()[fifo_watcher_id] = Value(std::move(watcher)); buffer->values()[fifo_watcher_id] = Value(std::move(watcher));