Changeset 1db9db8d0b364396bddde04728c8adb7b70c7d6b

Timestamp:

04/12/05 20:35:35 (3 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1133724935 +0000

git-parent:

[0d26b16638421761d2719a082c110cd1b8a3903b]

git-author:

Gildas Bazin <gbazin@videolan.org> 1133724935 +0000

Message:

* modules/audio_output/alsa.c: fixed minor memory leak.

Files:

• modules/audio_output/alsa.c (modified) (7 diffs)

modules/audio_output/alsa.c

@@ -316 +316 @@
-    p_sys->b_playing = VLC_FALSE;
-    p_sys->start_date = 0;
-    p_sys->p_status = (snd_pcm_status_t *)malloc(snd_pcm_status_sizeof());
-    vlc_cond_init( p_aout, &p_sys->wait );
-    vlc_mutex_init( p_aout, &p_sys->lock );
@@ -327 +326 @@
-        return VLC_EGENERIC;
-    }
+
+    p_sys->p_status = (snd_pcm_status_t *)malloc(snd_pcm_status_sizeof());
-
-    /* Choose the IEC device for S/PDIF output:
@@ -376 +377 @@
-    if ( var_Get( p_aout, "audio-device", &val ) < 0 )
-    {
+        free( p_sys->p_status );
-        free( p_sys );
-        free( psz_device );
@@ -412 +414 @@
-        /* This should not happen ! */
-        msg_Err( p_aout, "internal: can't find audio-device (%i)", val.i_int );
+        free( p_sys->p_status );
-        free( p_sys );
-        free( psz_device );
@@ -429 +432 @@
-            msg_Err( p_aout, "cannot open ALSA device `%s' (%s)",
-                             psz_iec_device, snd_strerror( i_snd_rc ) );
+            free( p_sys->p_status );
-            free( p_sys );
-            free( psz_device );
@@ -471 +475 @@
-            msg_Err( p_aout, "cannot open ALSA device `%s' (%s)",
-                             psz_device, snd_strerror( i_snd_rc ) );
+            free( p_sys->p_status );
-            free( p_sys );
-            free( psz_device );
@@ -674 +679 @@
-    snd_output_close( p_sys->p_snd_stderr );
-#endif
+    free( p_sys->p_status );
-    free( p_sys );
-    return VLC_EGENERIC;