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

jack: handle _port_get_buffer() on foreign ports

Browse source 
Some apps (ardour6) does a port_get_buffer() on a port that is not
its own port. This is not possible in PipeWire so make sure it
simply return NULL instead of crashing.

Fixes #988
This commit is contained in:
Wim Taymans 2021-03-29 11:14:37 +02:00
parent ef74ef3654
commit 74c6af1c55
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
pipewire-jack/src/pipewire-jack.c
View file

@ -3636,7 +3636,9 @@ void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t frames)
spa_return_val_if_fail(o != NULL, NULL); spa_return_val_if_fail(o != NULL, NULL);
p = o->port.port; if ((p = o->port.port) == NULL)
return NULL;
ptr = p->get_buffer(p, frames); ptr = p->get_buffer(p, frames);
pw_log_trace_fp(NAME" %p: port %p buffer %p empty:%u", p->client, p, ptr, p->empty_out); pw_log_trace_fp(NAME" %p: port %p buffer %p empty:%u", p->client, p, ptr, p->empty_out);
return ptr; return ptr;
@ -5124,7 +5126,8 @@ SPA_EXPORT
uint32_t jack_midi_get_event_count(void* port_buffer) uint32_t jack_midi_get_event_count(void* port_buffer)
{ {
struct midi_buffer *mb = port_buffer; struct midi_buffer *mb = port_buffer;
spa_return_val_if_fail(mb != NULL, 0); if (mb == NULL)
return 0;
return mb->event_count; return mb->event_count;
} }