mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Don't double-free variant streams on errors

Browse source 
If an error happened switching to a new variant, we switch back to the previous
one ... except it will be unreffed when settin git.

In order to avoid such issues, keep a reference to the old variant until we're
sure we don't need it anymore

Fixes cases of double-free on variants and its contents

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1799>
This commit is contained in:
Edward Hervey 2020-11-11 18:07:57 +01:00 committed by GStreamer Merge Bot
parent 04472c5adb
commit a4b20ed276
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/hls/gsthlsdemux.c
View file

@ -1759,7 +1759,8 @@ gst_hls_demux_change_playlist (GstHLSDemux * demux, guint max_bitrate,
stream = adaptive_demux->streams->data;
previous_variant = demux->current_variant;
/* Make sure we keep a reference in case we need to switch back */
previous_variant = gst_hls_variant_stream_ref (demux->current_variant);
new_variant =
gst_hls_master_playlist_get_variant_for_bitrate (demux->master,
demux->current_variant, max_bitrate);
@ -1773,6 +1774,7 @@ retry_failover_protection:
/* Don't do anything else if the playlist is the same */
if (new_bandwidth == old_bandwidth) {
GST_M3U8_CLIENT_UNLOCK (demux->client);
gst_hls_variant_stream_unref (previous_variant);
return TRUE;
}
@ -1834,6 +1836,7 @@ retry_failover_protection:
return gst_hls_demux_change_playlist (demux, new_bandwidth - 1, changed);
}
gst_hls_variant_stream_unref (previous_variant);
return TRUE;
}