mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

meta: make safer find_meta_data function

Browse source
This commit is contained in:
Wim Taymans 2018-07-09 12:04:23 +02:00
parent 33427b4cd3
commit c98fbfe0a9
16 changed files with 59 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spa/plugins/volume/volume.c
View file

@ -610,6 +610,7 @@ impl_node_port_use_buffers(struct spa_node *node,
struct impl *this;
struct port *port;
uint32_t i;
struct type *t;
spa_return_val_if_fail(node != NULL, -EINVAL);
@ -622,6 +623,8 @@ impl_node_port_use_buffers(struct spa_node *node,
if (!port->have_format)
return -EIO;
t = &this->type;
clear_buffers(this, port);
for (i = 0; i < n_buffers; i++) {
@ -631,11 +634,11 @@ impl_node_port_use_buffers(struct spa_node *node,
b = &port->buffers[i];
b->outbuf = buffers[i];
b->outstanding = direction == SPA_DIRECTION_INPUT;
b->h = spa_buffer_find_meta(buffers[i], this->type.meta.Header);
b->h = spa_buffer_find_meta_data(buffers[i], t->meta.Header, sizeof(*b->h));
if ((d[0].type == this->type.data.MemPtr ||
d[0].type == this->type.data.MemFd ||
d[0].type == this->type.data.DmaBuf) && d[0].data != NULL) {
if ((d[0].type == t->data.MemPtr ||
d[0].type == t->data.MemFd ||
d[0].type == t->data.DmaBuf) && d[0].data != NULL) {
b->ptr = d[0].data;
b->size = d[0].maxsize;
} else {