Skip to content

V
vlc
Commit 399c991f authored by Rafaël Carré's avatar Rafaël Carré
Browse files
Options

HLS demux: fix crash on invalid playlist 

Close #8498
parent f24ef231
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
modules/stream_filter/httplive.c
View file @ 399c991f
......@@ -1000,30 +1000,30 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams, uint8_t *buffer, const
free(uri);
/* Download playlist file from server */
uint8_t *buf = NULL;
ssize_t len = read_M3U8_from_url(s, hls->url, &buf);
if (len < 0)
{
msg_Warn(s, "failed to read %s, continue for other streams", hls->url);
failed_to_download_stream_m3u8 = true;
/* remove stream just added */
if (new_stream_added)
vlc_array_remove(streams, vlc_array_count(streams) - 1);
/* ignore download error, so we have chance to try other streams */
err = VLC_SUCCESS;
}
else
{
/* Parse HLS m3u8 content. */
err = parse_M3U8(s, streams, buf, len);
free(buf);
}
if (hls)
{
/* Download playlist file from server */
uint8_t *buf = NULL;
ssize_t len = read_M3U8_from_url(s, hls->url, &buf);
if (len < 0)
{
msg_Warn(s, "failed to read %s, continue for other streams", hls->url);
failed_to_download_stream_m3u8 = true;
/* remove stream just added */
if (new_stream_added)
vlc_array_remove(streams, vlc_array_count(streams) - 1);
/* ignore download error, so we have chance to try other streams */
err = VLC_SUCCESS;
}
else
{
/* Parse HLS m3u8 content. */
err = parse_M3U8(s, streams, buf, len);
free(buf);
}
hls->version = version;
if (!p_sys->b_live)
hls->size = hls_GetStreamSize(hls); /* Stream size (approximate) */
......
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