Skip to content

V
vlc
Commit bcbad8c7 authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen Committed by Jean-Baptiste Kempf
Browse files
Options

hls: Fixing some locks. 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 04f73b95
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/stream_filter/httplive.c
View file @ bcbad8c7
......@@ -1360,11 +1360,11 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
segment_t *segment = segment_Find(*hls, p->sequence);
if (segment)
{
vlc_mutex_lock(&segment->lock);
assert(p->url.psz_path);
assert(segment->url.psz_path);
vlc_mutex_lock(&segment->lock);
/* they should be the same */
if ((p->sequence != segment->sequence) ||
(p->duration != segment->duration) ||
......@@ -1382,6 +1382,7 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
{
msg_Err(s, "Failed updating segment %d - skipping it", p->sequence);
segment_Free(p);
vlc_mutex_unlock(&segment->lock);
continue;
}
segment->sequence = p->sequence;
......@@ -1396,11 +1397,10 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t *hls_new, hls_stream_t *
}
free(segment->psz_key_path);
segment->psz_key_path = p->psz_key_path ? strdup(p->psz_key_path) : NULL;
vlc_mutex_unlock(&segment->lock);
segment_Free(p);
free(psz_url);
}
vlc_mutex_unlock(&segment->lock);
}
else
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment