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

jack: handle regcomp errors

Browse source
This commit is contained in:
Wim Taymans 2021-11-29 12:46:50 +01:00
parent 11b8a2aad4
commit 3df6e77996
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5211,6 +5211,7 @@ const char ** jack_get_ports (jack_client_t *client,
struct object *tmp[JACK_PORT_MAX]; struct object *tmp[JACK_PORT_MAX];
const char *str; const char *str;
uint32_t i, count, id; uint32_t i, count, id;
int r;
regex_t port_regex, type_regex; regex_t port_regex, type_regex;
spa_return_val_if_fail(c != NULL, NULL); spa_return_val_if_fail(c != NULL, NULL);
@ -5220,10 +5221,18 @@ const char ** jack_get_ports (jack_client_t *client,
else else
id = SPA_ID_INVALID; id = SPA_ID_INVALID;
if (port_name_pattern && port_name_pattern[0]) if (port_name_pattern && port_name_pattern[0]) {
regcomp(&port_regex, port_name_pattern, REG_EXTENDED | REG_NOSUB); if ((r = regcomp(&port_regex, port_name_pattern, REG_EXTENDED | REG_NOSUB)) != 0) {
if (type_name_pattern && type_name_pattern[0]) pw_log_error("cant compile regex %s: %d", port_name_pattern, r);
regcomp(&type_regex, type_name_pattern, REG_EXTENDED | REG_NOSUB); return NULL;
}
}
if (type_name_pattern && type_name_pattern[0]) {
if ((r = regcomp(&type_regex, type_name_pattern, REG_EXTENDED | REG_NOSUB)) != 0) {
pw_log_error("cant compile regex %s: %d", type_name_pattern, r);
return NULL;
}
}
pw_log_debug("%p: ports id:%d name:\"%s\" type:\"%s\" flags:%08lx", c, id, pw_log_debug("%p: ports id:%d name:\"%s\" type:\"%s\" flags:%08lx", c, id,
port_name_pattern, type_name_pattern, flags); port_name_pattern, type_name_pattern, flags);