vlc | branch: master | Zhao Zhili <quinkbl...@foxmail.com> | Wed Sep 13 14:09:06 2017 +0800| [784da6be1e186cca425a6f5644d42e16db298634] | committer: Francois Cartegnie
demux: adaptive: fix cancellation during refresh playlist This patch fixed a crash due to assert failure since mutex is not unlocked before vlc_mutex_destroy(). Signed-off-by: Francois Cartegnie <fcvlc...@free.fr> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=784da6be1e186cca425a6f5644d42e16db298634 --- modules/demux/adaptive/PlaylistManager.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/demux/adaptive/PlaylistManager.cpp b/modules/demux/adaptive/PlaylistManager.cpp index 3ee5014ae0..706ece0ad1 100644 --- a/modules/demux/adaptive/PlaylistManager.cpp +++ b/modules/demux/adaptive/PlaylistManager.cpp @@ -633,10 +633,12 @@ void PlaylistManager::Run() if(needsUpdate()) { + int canc = vlc_savecancel(); if(updatePlaylist()) scheduleNextUpdate(); else failedupdates++; + vlc_restorecancel(canc); } vlc_mutex_lock(&demux.lock); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
