mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-03-26 07:58:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: never return NULL from jack_port_by_id()

Browse source 
JACK will never return NULL from jack_port_by_id() because the id
and the port_t are the same for JACK.

In PipeWire however we use the serial number as the id and so it can
be removed and become invalid. In this case, return a dummy port
from the client that can be used for some of the basic operations
you can do on a port_t, like get the name etc.

Also make sure that port_name() doesn't return NULL in case we use the
dummy port (which has the client set to NULL).

Fixes #3512
This commit is contained in:
Wim Taymans 2026-03-02 11:41:21 +01:00
parent 5cd734e8c0
commit 0d14f44f47
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -492,6 +492,8 @@ struct client {
jack_position_t jack_position; jack_position_t jack_position;
jack_transport_state_t jack_state; jack_transport_state_t jack_state;
struct frame_times jack_times; struct frame_times jack_times;
struct object dummy_port;
}; };
#define return_val_if_fail(expr, val) \ #define return_val_if_fail(expr, val) \
@ -4468,6 +4470,11 @@ jack_client_t * jack_client_open (const char *client_name,
0, NULL, &client->info); 0, NULL, &client->info);
client->info.change_mask = 0; client->info.change_mask = 0;
client->dummy_port.type = INTERFACE_Port;
snprintf(client->dummy_port.port.name, sizeof(client->dummy_port.port.name), "%s:dummy", client_name);
snprintf(client->dummy_port.port.alias1, sizeof(client->dummy_port.port.alias1), "%s:dummy", client_name);
snprintf(client->dummy_port.port.alias2, sizeof(client->dummy_port.port.alias2), "%s:dummy", client_name);
client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true); client->show_monitor = pw_properties_get_bool(client->props, "jack.show-monitor", true);
client->show_midi = pw_properties_get_bool(client->props, "jack.show-midi", true); client->show_midi = pw_properties_get_bool(client->props, "jack.show-midi", true);
client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", true); client->merge_monitor = pw_properties_get_bool(client->props, "jack.merge-monitor", true);
@ -5951,9 +5958,7 @@ static const char *port_name(struct object *o)
{ {
const char *name; const char *name;
struct client *c = o->client; struct client *c = o->client;
if (c == NULL) if (c != NULL && c->default_as_system && is_port_default(c, o))
return NULL;
if (c->default_as_system && is_port_default(c, o))
name = o->port.system; name = o->port.system;
else else
name = o->port.name; name = o->port.name;
@ -6999,13 +7004,11 @@ jack_port_t * jack_port_by_id (jack_client_t *client,
pthread_mutex_lock(&c->context.lock); pthread_mutex_lock(&c->context.lock);
res = find_by_serial(c, port_id); res = find_by_serial(c, port_id);
if (res && res->type != INTERFACE_Port)
res = NULL;
pw_log_debug("%p: port %d -> %p", c, port_id, res);
pthread_mutex_unlock(&c->context.lock); pthread_mutex_unlock(&c->context.lock);
if (res == NULL || res->type != INTERFACE_Port)
res = &c->dummy_port;
if (res == NULL) pw_log_debug("%p: port %d -> %p", c, port_id, res);
pw_log_info("%p: port %d not found", c, port_id);
return object_to_port(res); return object_to_port(res);
} }