Fixed a potential race condition in interaction.

[vlc] / src / interface / interface.c

diff --git a/src/interface/interface.c b/src/interface/interface.c
index e6349841b568db19c93ca4c365fdab7a64e85b5d..990335dff310cb7c01dc979027d6bce1ce1104ff 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -49,9 +49,9 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf );
+static void* RunInterface( vlc_object_t *p_this );
 #ifdef __APPLE__
-static void MonitorLibVLCDeath( intf_thread_t *p_intf );
+static void * MonitorLibVLCDeath( vlc_object_t *p_this );
 #endif
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
@@ -150,7 +150,7 @@ int intf_RunThread( intf_thread_t *p_intf )
             msg_Err( p_intf, "cannot spawn libvlc death monitoring thread" );
             return VLC_EGENERIC;
         }
-        RunInterface( p_intf );
+        RunInterface( VLC_OBJECT(p_intf) );
 
         /* Make sure our MonitorLibVLCDeath thread exit */
         vlc_object_kill( p_intf );
@@ -193,8 +193,9 @@ void intf_StopThread( intf_thread_t *p_intf )
 /*****************************************************************************
  * RunInterface: setups necessary data and give control to the interface
  *****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf )
+static void* RunInterface( vlc_object_t *p_this )
 {
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
     vlc_value_t val, text;
     char *psz_intf;
 
@@ -257,14 +258,16 @@ static void RunInterface( intf_thread_t *p_intf )
         p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
     }
     while( p_intf->p_module );
+    return NULL;
 }
 
 #ifdef __APPLE__
 /*****************************************************************************
  * MonitorLibVLCDeath: Used when b_should_run_on_first_thread is set.
  *****************************************************************************/
-static void MonitorLibVLCDeath( intf_thread_t *p_intf )
+static void * MonitorLibVLCDeath( vlc_object_t * p_this )
 {
+    intf_thread_t *p_intf = (intf_thread_t *)p_this;
     libvlc_int_t * p_libvlc = p_intf->p_libvlc;
     vlc_object_lock( p_libvlc );
     while(vlc_object_alive( p_libvlc ) )
@@ -272,7 +275,7 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
         if(p_intf->b_die)
         {
             vlc_object_unlock( p_libvlc );
-            return;
+            return NULL;
         }
         vlc_object_wait( p_libvlc );
     }
@@ -289,6 +292,7 @@ static void MonitorLibVLCDeath( intf_thread_t *p_intf )
         vlc_object_kill( p_intf );
     }
     vlc_list_release( p_list );
+    return NULL;
 }
 #endif