marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[volume] fix memory leak

Browse Source 
mend
This commit is contained in:
Felix Buehler 2020-04-26 21:43:08 +02:00
parent 44fad4d2cd
commit 269c06c4bb
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/print_volume.c
View File

@ -115,7 +115,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
buffer, buffer,
ivolume, ivolume,
description); description);
goto out; goto out_with_format;
} else if (!strcasecmp(device, "default") && pulse_initialize()) { } else if (!strcasecmp(device, "default") && pulse_initialize()) {
/* no device specified or "default" set */ /* no device specified or "default" set */
char description[MAX_SINK_DESCRIPTION_LEN]; char description[MAX_SINK_DESCRIPTION_LEN];
@ -132,7 +132,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
buffer, buffer,
ivolume, ivolume,
description); description);
goto out; goto out_with_format;
} }
/* negative result or NULL description means error, fail PulseAudio attempt */ /* negative result or NULL description means error, fail PulseAudio attempt */
} }
@ -234,10 +234,11 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
ALSA_MUTE_SWITCH(capture) ALSA_MUTE_SWITCH(capture)
} }
outwalk = apply_volume_format(fmt, outwalk, avg, mixer_name); buffer = apply_volume_format(fmt, buffer, avg, mixer_name);
snd_mixer_close(m); snd_mixer_close(m);
snd_mixer_selem_id_free(sid); snd_mixer_selem_id_free(sid);
goto out_with_format;
#endif #endif
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
@ -350,10 +351,18 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
#endif #endif
buffer = apply_volume_format(fmt, buffer, vol & 0x7f, devicename); buffer = apply_volume_format(fmt, buffer, vol & 0x7f, devicename);
close(mixfd); close(mixfd);
goto out_with_format;
#endif #endif
out: out:
if (!pbval) if (!pbval)
END_COLOR; END_COLOR;
OUTPUT_FULL_TEXT(buffer); OUTPUT_FULL_TEXT(buffer);
return;
out_with_format:
if (!pbval)
END_COLOR;
OUTPUT_FULL_TEXT(buffer);
free(buffer);
} }