X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faudio_output%2Foss.c;h=929aeacb7e6faacd16f17f787bf5fa0c2d626c49;hb=19933fe7a674ee6d1253821a656507a6a712f8d0;hp=fcd3ca0ea208abc5ce2a38db892c544fb188b988;hpb=f66626b34809a4881a52582ae755586e885270c6;p=vlc

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index fcd3ca0ea2..929aeacb7e 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -299,6 +299,7 @@ static int Open( vlc_object_t *p_this )
     if( p_sys->i_fd < 0 )
     {
         msg_Err( p_aout, "cannot open audio device (%s)", psz_device );
+        free( psz_device );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -589,7 +590,7 @@ static int OSSThread( aout_instance_t * p_aout )
     struct aout_sys_t * p_sys = p_aout->output.p_sys;
     mtime_t next_date = 0;
 
-    while ( !p_aout->b_die )
+    while ( vlc_object_alive (p_aout) )
     {
         aout_buffer_t * p_buffer = NULL;
         int i_tmp, i_size;
@@ -646,7 +647,7 @@ static int OSSThread( aout_instance_t * p_aout )
                 }
             }
 
-            while( !p_aout->b_die && ! ( p_buffer =
+            while( vlc_object_alive (p_aout) && ! ( p_buffer =
                 aout_OutputNextBuffer( p_aout, next_date, true ) ) )
             {
                 msleep( 1000 );