alsa: fix memory leaks from snd_*_open*()

ALSA uses a global config structure that's overwritten (and not free'd) every time one of those functions is called, so we have to manually call snd_config_update_free_global() to release it. Hint taken from MEMORY-LEAK in the ALSA source code git-svn-id: https://svn.musicpd.org/mpd/trunk@4381 09075e82-0dd4-0310-85a5-a0d7c8717e4f

alsa: fix memory leaks from snd__open()
5f508702 · Eric Wong · 368034e1 · 5f508702 · 5f508702
Commit 5f508702 authored Jul 17, 2006 by Eric Wong
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

audioOutput_alsa.c src/audioOutputs/audioOutput_alsa.c +2 -0

volume.c src/volume.c +3 -1

No files found.
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -106,6 +106,7 @@ static int alsa_testDefault(void)

 	int ret = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, 
 					           SND_PCM_NONBLOCK);
+	snd_config_update_free_global();
 	
 	if(ret) {
 		WARNING("Error opening default alsa device: %s\n",
@@ -152,6 +153,7 @@ static int alsa_openDevice(AudioOutput * audioOutput)

 	err = snd_pcm_open(&ad->pcmHandle, ad->device, 
 			SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
+	snd_config_update_free_global();
 	if(err < 0) {
 		ad->pcmHandle = NULL;
 		goto error;

--- a/src/volume.c
+++ b/src/volume.c
@@ -214,7 +214,9 @@ static int prepAlsaMixer(char * card) {
 	char * controlName = VOLUME_MIXER_ALSA_CONTROL_DEFAULT;
        ConfigParam * param;

-	if((err = snd_mixer_open(&volume_alsaMixerHandle,0))<0) {
+	err = snd_mixer_open(&volume_alsaMixerHandle,0);
+	snd_config_update_free_global();
+	if (err < 0) {
 		WARNING("problems opening alsa mixer: %s\n",snd_strerror(err));
 		return -1;
 	}