[vlc-devel] commit: Fixed a possible fetcher deadlock. (Laurent Aimar )

git version control git at videolan.org
Tue Mar 10 00:01:49 CET 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Mar  9 23:41:41 2009 +0100| [c7688765fc70c5d5d26af2c05325d8cb24def4ca] | committer: Laurent Aimar 

Fixed a possible fetcher deadlock.

It could happen if the input_thread_t die before/without sending any
meta event.

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

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

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index a6ab382..a35b732 100644
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -318,7 +318,8 @@ static int InputEvent( vlc_object_t *p_this, char const *psz_cmd,
     VLC_UNUSED(p_this); VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval);
     playlist_fetcher_t *p_fetcher = p_data;
 
-    if( newval.i_int == INPUT_EVENT_ITEM_META )
+    if( newval.i_int == INPUT_EVENT_ITEM_META ||
+        newval.i_int == INPUT_EVENT_DEAD )
         vlc_cond_signal( &p_fetcher->wait );
 
     return VLC_SUCCESS;




More information about the vlc-devel mailing list