mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

loop: align buffer and invoke_items to 8 bytes

Browse source 
To avoid unaligned access messages from sanitizer

See #497
This commit is contained in:
Wim Taymans 2020-12-21 20:46:13 +01:00
parent 461e3db741
commit 08ba6097a1
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/support/loop.c
View file

@ -79,7 +79,8 @@ struct impl {
int ack_fd; int ack_fd;
struct spa_ringbuffer buffer; struct spa_ringbuffer buffer;
uint8_t buffer_data[DATAS_SIZE]; uint8_t *buffer_data;
uint8_t buffer_mem[DATAS_SIZE + 8];
unsigned int flushing:1; unsigned int flushing:1;
}; };
@ -193,14 +194,15 @@ loop_invoke(void *object,
if (l0 > sizeof(struct invoke_item) + size) { if (l0 > sizeof(struct invoke_item) + size) {
item->data = SPA_MEMBER(item, sizeof(struct invoke_item), void); item->data = SPA_MEMBER(item, sizeof(struct invoke_item), void);
item->item_size = sizeof(struct invoke_item) + size; item->item_size = SPA_ROUND_UP_N(sizeof(struct invoke_item) + size, 8);
if (l0 < sizeof(struct invoke_item) + item->item_size) if (l0 < sizeof(struct invoke_item) + item->item_size)
item->item_size = l0; item->item_size = l0;
} else { } else {
item->data = impl->buffer_data; item->data = impl->buffer_data;
item->item_size = l0 + size; item->item_size = SPA_ROUND_UP_N(l0 + size, 8);
} }
memcpy(item->data, data, size); if (data && size > 0)
memcpy(item->data, data, size);
spa_ringbuffer_write_update(&impl->buffer, idx + item->item_size); spa_ringbuffer_write_update(&impl->buffer, idx + item->item_size);
@ -793,6 +795,7 @@ impl_init(const struct spa_handle_factory *factory,
spa_list_init(&impl->destroy_list); spa_list_init(&impl->destroy_list);
spa_hook_list_init(&impl->hooks_list); spa_hook_list_init(&impl->hooks_list);
impl->buffer_data = SPA_PTR_ALIGN(impl->buffer_mem, 8, uint8_t);
spa_ringbuffer_init(&impl->buffer); spa_ringbuffer_init(&impl->buffer);
impl->wakeup = loop_add_event(impl, wakeup_func, impl); impl->wakeup = loop_add_event(impl, wakeup_func, impl);