* ./modules/audio_output/esd.c: fixed a stack space leak (Closes: #113).

modules/audio_output/esd.c

@@ -2,7 +2,7 @@
  * esd.c : EsounD module
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: esd.c,v 1.15 2002/11/15 17:17:29 gbazin Exp $
+ * $Id: esd.c,v 1.16 2003/01/28 03:46:22 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -57,6 +57,7 @@ static int  Open         ( vlc_object_t * );
 static void Close        ( vlc_object_t * );
 static void Play         ( aout_instance_t * );
 static int  ESDThread    ( aout_instance_t * );
+static void ESDLoop      ( aout_instance_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -120,7 +121,7 @@ static int Open( vlc_object_t *p_this )
                               p_aout->output.output.i_rate, NULL, "vlc" );
     if( p_sys->i_fd < 0 )
     {
-        msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %ld Hz)",
+        msg_Err( p_aout, "cannot open esound socket (format 0x%08x at %d Hz)",
                          p_sys->esd_format, p_aout->output.output.i_rate );
         free( p_sys );
         return -1;
@@ -179,13 +180,27 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static int ESDThread( aout_instance_t * p_aout )
 {
-    struct aout_sys_t * p_sys = p_aout->output.p_sys;
-
     while ( !p_aout->b_die )
     {
+        ESDLoop( p_aout );
+    }
+
+    return 0;
+}
+
+/*****************************************************************************
+ * ESDLoop: ESDThread's inner loop
+ *****************************************************************************
+ * This is a separate function because it makes use of alloca() which makes
+ * use of the caller's stack frame, which means we need to return after each
+ * iteration.
+ *****************************************************************************/
+static void ESDLoop( aout_instance_t * p_aout )
+{
+    struct aout_sys_t * p_sys = p_aout->output.p_sys;
     aout_buffer_t * p_buffer;
     int i_tmp, i_size;
-        byte_t * p_bytes;
+    byte_t * p_bytes = NULL;
 
     /* Get the presentation date of the next write() operation. It
      * is equal to the current date + buffered samples + esd latency */
@@ -217,9 +232,6 @@ static int ESDThread( aout_instance_t * p_aout )
     {
         aout_BufferFree( p_buffer );
     }
-    }
-
-    return 0;
 }
 
 #if 0