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

jack: increase client name size

Browse source 
Increase the client name size and try hard not to exceed the client name
size especially when adding the Monitor suffix.
Also avoid some potentially unsafe strncpy.

See #788
This commit is contained in:
Wim Taymans 2021-02-24 22:05:14 +01:00
parent dbc9a520ef
commit 8768cf1b68
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@
#define JACK_DEFAULT_VIDEO_TYPE "32 bit float RGBA video"
#define JACK_CLIENT_NAME_SIZE 64
#define JACK_CLIENT_NAME_SIZE 128
#define JACK_PORT_NAME_SIZE 256
#define JACK_PORT_MAX 4096
#define JACK_PORT_TYPE_SIZE 32
@ -2120,7 +2120,7 @@ static void registry_event_global(void *data, uint32_t id,
if (id == c->node_id) {
pw_log_debug(NAME" %p: add our node %d", c, id);
if (node_name != NULL)
strncpy(c->name, node_name, JACK_CLIENT_NAME_SIZE);
snprintf(c->name, sizeof(c->name), "%s", node_name);
}
app = spa_dict_lookup(props, PW_KEY_APP_NAME);
@ -2239,7 +2239,8 @@ static void registry_event_global(void *data, uint32_t id,
if (ot->node.is_bridge && strchr(str, ':') != NULL)
snprintf(tmp, sizeof(tmp), "%s", str);
else if (is_monitor && !c->merge_monitor)
snprintf(tmp, sizeof(tmp), "%s Monitor:%s", ot->node.name, str);
snprintf(tmp, sizeof(tmp), "%.*s Monitor:%s",
JACK_CLIENT_NAME_SIZE-8, ot->node.name, str);
else
snprintf(tmp, sizeof(tmp), "%s:%s", ot->node.name, str);
@ -2467,7 +2468,7 @@ jack_client_t * jack_client_open (const char *client_name,
goto no_props;
client->node_id = SPA_ID_INVALID;
strncpy(client->name, client_name, JACK_CLIENT_NAME_SIZE);
snprintf(client->name, sizeof(client->name), "%s", client_name);
client->context.loop = pw_thread_loop_new(client_name, NULL);
client->context.l = pw_thread_loop_get_loop(client->context.loop),
client->context.context = pw_context_new(