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

media-session: guard against invalid input

Browse source 
See #304
This commit is contained in:
Wim Taymans 2020-09-22 12:39:39 +02:00
parent cf2c32f0a9
commit a4e079e1cb
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/examples/media-session/default-routes.c
View file

@ -179,6 +179,8 @@ static int restore_route(struct device *dev, const char *val, uint32_t index, ui
for (p = val; *p; p++) { for (p = val; *p; p++) {
if (strstr(p, "volume:") == p) { if (strstr(p, "volume:") == p) {
vol = strtof(p+7, &end); vol = strtof(p+7, &end);
if (end == p + 7)
continue;
spa_pod_builder_prop(&b, SPA_PROP_volume, 0); spa_pod_builder_prop(&b, SPA_PROP_volume, 0);
spa_pod_builder_float(&b, vol); spa_pod_builder_float(&b, vol);
p = end; p = end;
@ -191,14 +193,19 @@ static int restore_route(struct device *dev, const char *val, uint32_t index, ui
} }
else if (strstr(p, "volumes:") == p) { else if (strstr(p, "volumes:") == p) {
n_vols = strtol(p+8, &end, 10); n_vols = strtol(p+8, &end, 10);
if (n_vols >= SPA_AUDIO_MAX_CHANNELS) if (end == p+8 || n_vols >= SPA_AUDIO_MAX_CHANNELS)
continue; continue;
p = end; p = end;
vols = alloca(n_vols * sizeof(float)); vols = alloca(n_vols * sizeof(float));
for (i = 0; i < n_vols; i++) { for (i = 0; i < n_vols && *p == ','; i++) {
vols[i] = strtof(p+1, &end); vols[i] = strtof(p+1, &end);
if (end == p+1)
break;
p = end; p = end;
} }
if (i != n_vols)
continue;
spa_pod_builder_prop(&b, SPA_PROP_channelVolumes, 0); spa_pod_builder_prop(&b, SPA_PROP_channelVolumes, 0);
spa_pod_builder_array(&b, sizeof(float), SPA_TYPE_Float, spa_pod_builder_array(&b, sizeof(float), SPA_TYPE_Float,
n_vols, vols); n_vols, vols);