mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

client-node: don't try to add invalid memid

Browse source
This commit is contained in:
Wim Taymans 2018-09-28 05:49:38 +02:00
parent b8fb7aeaad
commit 6b0c28e717
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/module-client-node/client-node.c
View file

@ -255,6 +255,7 @@ static struct mix *ensure_mix(struct impl *impl, struct port *p, uint32_t mix_id
static void clear_io(struct node *node, struct io *io) static void clear_io(struct node *node, struct io *io)
{ {
struct mem *m; struct mem *m;
spa_log_debug(node->log, "node %p: clear io %p %d %d", node, io, io->id, io->memid);
m = pw_array_get_unchecked(&node->impl->mems, io->memid, struct mem); m = pw_array_get_unchecked(&node->impl->mems, io->memid, struct mem);
m->ref--; m->ref--;
io->id = SPA_ID_INVALID; io->id = SPA_ID_INVALID;
@ -263,6 +264,7 @@ static void clear_io(struct node *node, struct io *io)
static struct io *update_io(struct impl *impl, struct port *port, static struct io *update_io(struct impl *impl, struct port *port,
struct mix *mix, uint32_t id, uint32_t memid) struct mix *mix, uint32_t id, uint32_t memid)
{ {
struct node *this = &impl->node;
int i; int i;
struct io *io, *f = NULL; struct io *io, *f = NULL;
@ -272,19 +274,20 @@ static struct io *update_io(struct impl *impl, struct port *port,
f = io; f = io;
else if (io->id == id) { else if (io->id == id) {
if (io->memid != memid) { if (io->memid != memid) {
clear_io(&impl->node, io); clear_io(this, io);
if (memid == SPA_ID_INVALID) if (memid == SPA_ID_INVALID)
io->id = SPA_ID_INVALID; io->id = SPA_ID_INVALID;
} }
goto found; goto found;
} }
} }
if (f == NULL) if (f == NULL || memid == SPA_ID_INVALID)
return NULL; return NULL;
io = f; io = f;
io->id = id; io->id = id;
io->memid = memid; io->memid = memid;
spa_log_debug(this->log, "node %p: add io %p %d %d", this, io, id, memid);
found: found:
return io; return io;