external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-22 20:25:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: initialize values, fixes valgrind warning

Browse source 
When snd_mixer_selem_get_*() fails, the values were left
uninitialized, trigger a valgrind warning.

In addition to fixing this, the error(s) are now logged (but only as
warnings, as they are not fatal).
This commit is contained in:
Daniel Eklöf 2019-01-07 18:29:03 +01:00
parent fdadf577e9
commit efe3dd06ab
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/alsa.c
View file

@ -58,12 +58,21 @@ update_state(struct module *mod, snd_mixer_elem_t *elem)
{
struct private *m = mod->private;
long cur, min, max;
snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, &cur);
snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
long cur = 0;
int r = snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, &cur);
if (r < 0)
LOG_WARN("%s,%s: failed to get current volume", m->card, m->mixer);
int unmuted;
snd_mixer_selem_get_playback_switch(elem, SND_MIXER_SCHN_MONO, &unmuted);
long min = 0, max = 0;
r = snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
if (r < 0)
LOG_WARN("%s,%s: failed to get volume min/max", m->card, m->mixer);
int unmuted = false;
r = snd_mixer_selem_get_playback_switch(elem, SND_MIXER_SCHN_MONO, &unmuted);
if (r < 0)
LOG_WARN("%s,%s: failed to get muted state", m->card, m->mixer);
LOG_DBG("muted=%d, cur=%ld, min=%ld, max=%ld", !unmuted, cur, min, max);