GitHub/ish
1
0
Fork 0
mirror of https://github.com/ish-app/ish.git synced 2026-05-28 21:10:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make fifo less segfaulty

Browse Source
This commit is contained in:
Theodore Dubois
2019-01-06 08:04:28 -08:00
parent e27db4c54c
commit b1c7f036b5
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/fifo.c
+3 -2
View File
@@ -31,10 +31,11 @@ int fifo_write(struct fifo *fifo, const void *data, size_t size, int flags) {
fifo->size -= excess;
}
size_t first_copy_size = fifo->capacity - fifo->start - fifo->size;
size_t tail = (fifo->start + fifo->size) % fifo->capacity;;
size_t first_copy_size = fifo->capacity - tail;
if (first_copy_size > size)
first_copy_size = size;
memcpy(&fifo->buf[fifo->start + fifo->size], data, first_copy_size);
memcpy(&fifo->buf[tail], data, first_copy_size);
memcpy(&fifo->buf[0], (char *) data + first_copy_size, size - first_copy_size);
fifo->size += size;
return 0;