[vlc-devel] commit: text: Remove forbidden, and subject to race, playlist input access. (Pierre d'Herbemont )

git version control git at videolan.org
Sat Jul 12 22:24:49 CEST 2008


vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat Jul 12 21:44:49 2008 +0200| [491e2b0e7ce2400f89c6c669d12275288cc0fdea]

text: Remove forbidden, and subject to race, playlist input access.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=491e2b0e7ce2400f89c6c669d12275288cc0fdea
---

 src/text/strings.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/text/strings.c b/src/text/strings.c
index ec8bebe..5d13957 100644
--- a/src/text/strings.c
+++ b/src/text/strings.c
@@ -664,12 +664,11 @@ char *__str_format_meta( vlc_object_t *p_object, const char *string )
     int d = 0;
 
     playlist_t *p_playlist = pl_Yield( p_object );
-    input_thread_t *p_input = p_playlist->p_input;
+    input_thread_t *p_input = playlist_CurrentInput( p_playlist );
     input_item_t *p_item = NULL;
     pl_Release( p_object );
     if( p_input )
     {
-        vlc_object_yield( p_input );
         p_item = input_GetItem(p_input);
     }
 




More information about the vlc-devel mailing list