release_input_thread: NULL check after dereference

1994eafa · Rémi Denis-Courmont · 5af0a5d4 · 1994eafa
Commit 1994eafa authored Feb 17, 2010 by Rémi Denis-Courmont
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/control/media_player.c src/control/media_player.c +3 -4

No files found.
--- 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",