pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

bar: wayland: check return values of ftruncate(), read() and write()

Browse source 
Fixes building with -D_FORTIFY_SOURCE=2
This commit is contained in:
Daniel Eklöf 2019-05-04 11:27:51 +02:00
parent 48da200924
commit b41255dbcc
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bar/wayland.c
View file

@ -471,7 +471,10 @@ get_buffer(struct wayland_backend *backend)
const uint32_t stride = cairo_format_stride_for_width( const uint32_t stride = cairo_format_stride_for_width(
CAIRO_FORMAT_ARGB32, backend->width); CAIRO_FORMAT_ARGB32, backend->width);
size = stride * backend->height; size = stride * backend->height;
ftruncate(pool_fd, size); if (ftruncate(pool_fd, size) == -1) {
LOG_ERR("failed to truncate SHM pool");
goto err;
}
mmapped = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, pool_fd, 0); mmapped = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, pool_fd, 0);
if (mmapped == MAP_FAILED) { if (mmapped == MAP_FAILED) {
@ -800,14 +803,23 @@ loop(struct bar *_bar,
if (fds[1].revents & POLLHUP) { if (fds[1].revents & POLLHUP) {
LOG_WARN("disconnceted from wayland"); LOG_WARN("disconnceted from wayland");
write(_bar->abort_fd, &(uint64_t){1}, sizeof(uint64_t)); if (write(_bar->abort_fd, &(uint64_t){1}, sizeof(uint64_t))
!= sizeof(uint64_t))
{
LOG_ERRNO("failed to signal abort to modules");
}
break; break;
} }
if (fds[2].revents & POLLIN) { if (fds[2].revents & POLLIN) {
uint8_t command; uint8_t command;
//wl_display_cancel_read(backend->display); //wl_display_cancel_read(backend->display);
read(backend->pipe_fds[0], &command, sizeof(command)); if (read(backend->pipe_fds[0], &command, sizeof(command))
!= sizeof(command))
{
LOG_ERRNO("failed to read from command pipe");
break;
}
assert(command == 1); assert(command == 1);
//printf("refresh\n"); //printf("refresh\n");
@ -918,7 +930,11 @@ refresh(const struct bar *_bar)
const struct private *bar = _bar->private; const struct private *bar = _bar->private;
const struct wayland_backend *backend = bar->backend.data; const struct wayland_backend *backend = bar->backend.data;
write(backend->pipe_fds[1], &(uint8_t){1}, sizeof(uint8_t)); if (write(backend->pipe_fds[1], &(uint8_t){1}, sizeof(uint8_t))
!= sizeof(uint8_t))
{
LOG_ERRNO("failed to signal 'refresh' to main thread");
}
} }
static void static void