]> git.sesse.net Git - vlc/commitdiff
release_input_thread: NULL check after dereference
authorRémi Denis-Courmont <remi@remlab.net>
Wed, 17 Feb 2010 21:09:19 +0000 (23:09 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Wed, 17 Feb 2010 21:09:19 +0000 (23:09 +0200)
src/control/media_player.c

index f28b36998d491a24aa60641212ce31953652a6a6..54c528271a300b726dc27eadc464e201a4f14d8c 100644 (file)
@@ -102,13 +102,12 @@ static inline void unlock(libvlc_media_player_t *mp)
  */
 static void release_input_thread( libvlc_media_player_t *p_mi, bool b_input_abort )
 {
-    input_thread_t * p_input_thread;
+    assert( p_mi );
 
-    if( !p_mi || !p_mi->p_input_thread )
+    input_thread_t *p_input_thread = p_mi->p_input_thread;
+    if( !p_input_thread )
         return;
 
-    p_input_thread = p_mi->p_input_thread;
-
     var_DelCallback( p_input_thread, "can-seek",
                      input_seekable_changed, p_mi );
     var_DelCallback( p_input_thread, "can-pause",