]> git.sesse.net Git - vlc/commitdiff
libvlc_media_player_get_media: missing lock
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 12 Jul 2009 20:18:23 +0000 (23:18 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 12 Jul 2009 20:18:47 +0000 (23:18 +0300)
src/control/media_player.c

index 1c8ac775206468263dbddf6c1a59be1a0c213900..31940787884afc543115b26fc5ee57f3d1e22261 100644 (file)
@@ -494,12 +494,14 @@ libvlc_media_player_get_media(
                             libvlc_media_player_t *p_mi,
                             libvlc_exception_t *p_e )
 {
+    libvlc_media_t *p_m;
     VLC_UNUSED(p_e);
 
-    if( !p_mi->p_md )
-        return NULL;
-
-    libvlc_media_retain( p_mi->p_md );
+    vlc_mutex_lock( &p_mi->object_lock );
+    p_m = p_mi->p_md;
+    if( p_m )
+        libvlc_media_retain( p_mi->p_md );
+    vlc_mutex_unlock( &p_mi->object_lock );
     return p_mi->p_md;
 }