From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 17 Feb 2010 21:09:19 +0000 (+0200)
Subject: release_input_thread: NULL check after dereference
X-Git-Tag: 1.1.0-pre1~864
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1994eafa59427665edd4488445304597986bc14f;p=vlc

release_input_thread: NULL check after dereference
---

diff --git a/src/control/media_player.c b/src/control/media_player.c
index f28b36998d..54c528271a 100644
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -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",