mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-19 08:57:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

modules: clamp input offset and size

Browse source 
So that we don't cause memory errors with invalid input.
This commit is contained in:
Wim Taymans 2022-06-04 11:47:48 +02:00
parent 24ba3f4d92
commit 0f839c7b61
10 changed files with 96 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-pipe-tunnel.c
View file

@ -211,7 +211,7 @@ static void playback_stream_process(void *data)
{
struct impl *impl = data;
struct pw_buffer *buf;
uint32_t i, size, offset;
uint32_t i, size, offs;
ssize_t written;
if ((buf = pw_stream_dequeue_buffer(impl->stream)) == NULL) {
@ -222,11 +222,12 @@ static void playback_stream_process(void *data)
for (i = 0; i < buf->buffer->n_datas; i++) {
struct spa_data *d;
d = &buf->buffer->datas[i];
size = d->chunk->size;
offset = d->chunk->offset;
offs = SPA_MIN(d->chunk->offset, d->maxsize);
size = SPA_MIN(d->chunk->size, d->maxsize - offs);
while (size > 0) {
written = write(impl->fd, SPA_MEMBER(d->data, offset, void), size);
written = write(impl->fd, SPA_MEMBER(d->data, offs, void), size);
if (written < 0) {
if (errno == EINTR) {
/* retry if interrupted */
@ -238,7 +239,7 @@ static void playback_stream_process(void *data)
pw_log_warn("Failed to write to pipe sink");
}
}
offset += written;
offs += written;
size -= written;
}
}