mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pactl: fix parsing of percentages with decimal points

Browse source 
The logic for detecting which type of volume was given incorrectly interpreted
any value with a decimal as a VOL_LINEAR. It also could set multiple flags,
which would put the flags variable into an indeterminate state. Additionally,
the flags stack variable was uninitialized which could also lead to an
indeterminate flag state.

Percentages are now prioritized over all other types, and only one type flag
can be set.
This commit is contained in:
Sean Greenslade 2022-06-04 00:24:49 -07:00
parent b55bcc3df3
commit 05c06afa58
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/utils/pactl.c
View file

@ -2527,16 +2527,16 @@ static int parse_volume(const char *vol_spec, pa_volume_t *vol, enum volume_flag
vs = pa_xstrdup(vol_spec);
*vol_flags = (pa_startswith(vs, "+") || pa_startswith(vs, "-")) ? VOL_RELATIVE : VOL_ABSOLUTE;
if (strchr(vs, '.'))
*vol_flags |= VOL_LINEAR;
if (pa_endswith(vs, "%")) {
*vol_flags |= VOL_PERCENT;
vs[strlen(vs)-1] = 0;
}
if (pa_endswith(vs, "db") || pa_endswith(vs, "dB")) {
else if (pa_endswith(vs, "db") || pa_endswith(vs, "dB")) {
*vol_flags |= VOL_DECIBEL;
vs[strlen(vs)-2] = 0;
}
else if (strchr(vs, '.'))
*vol_flags |= VOL_LINEAR;
atod_input = vs;
@ -2597,7 +2597,7 @@ static int parse_volumes(char *args[], unsigned n) {
volume.channels = n;
for (i = 0; i < volume.channels; i++) {
enum volume_flags flags;
enum volume_flags flags = 0;
if (parse_volume(args[i], &volume.values[i], &flags) < 0)
return -1;