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

media-session: sanitize device names as well

Browse source 
See #827
This commit is contained in:
Wim Taymans 2021-03-04 12:45:35 +01:00
parent 184bdbeb4c
commit 1642e5220f
3 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/examples/media-session/alsa-monitor.c
View file

@ -488,7 +488,7 @@ static int update_device_props(struct device *device)
{
struct pw_properties *p = device->props;
const char *s, *d;
char temp[32];
char temp[32], tmp[1024];
int i;
s = pw_properties_get(p, SPA_KEY_DEVICE_NAME);
@ -500,7 +500,9 @@ static int update_device_props(struct device *device)
snprintf(temp, sizeof(temp), "%d", device->id);
s = temp;
}
pw_properties_setf(p, PW_KEY_DEVICE_NAME, "alsa_card.%s", s);
pw_properties_set(p, PW_KEY_DEVICE_NAME,
sm_media_session_sanitize_name(tmp, sizeof(tmp),
'_', "alsa_card.%s", s));
for (i = 2; i <= 99; i++) {
if ((d = pw_properties_get(p, PW_KEY_DEVICE_NAME)) == NULL)
@ -509,7 +511,9 @@ static int update_device_props(struct device *device)
if (alsa_find_device(device->impl, SPA_ID_INVALID, d) == NULL)
break;
pw_properties_setf(p, PW_KEY_DEVICE_NAME, "alsa_card.%s.%d", s, i);
pw_properties_set(p, PW_KEY_DEVICE_NAME,
sm_media_session_sanitize_name(tmp, sizeof(tmp),
'_', "alsa_card.%s.%d", s, i));
}
if (i == 99)
return -EEXIST;