mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-06 07:28:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux: Fix memory leak caused by double buffer map

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=789999
This commit is contained in:
Jun Xie 2017-11-09 12:36:44 +08:00 committed by Sebastian Dröge
parent ec32124cf0
commit 0ef2a41d84
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/hls/gsthlsdemux.c
View file

@ -802,19 +802,17 @@ gst_hls_demux_handle_buffer (GstAdaptiveDemux * demux,
{ {
GstHLSDemuxStream *hls_stream = GST_HLS_DEMUX_STREAM_CAST (stream); // FIXME: pass HlsStream into function GstHLSDemuxStream *hls_stream = GST_HLS_DEMUX_STREAM_CAST (stream); // FIXME: pass HlsStream into function
GstHLSDemux *hlsdemux = GST_HLS_DEMUX_CAST (demux); GstHLSDemux *hlsdemux = GST_HLS_DEMUX_CAST (demux);
GstMapInfo info;
GstClockTime first_pcr, last_pcr; GstClockTime first_pcr, last_pcr;
GstTagList *tags; GstTagList *tags;
if (buffer == NULL) if (buffer == NULL)
return GST_FLOW_OK; return GST_FLOW_OK;
gst_buffer_map (buffer, &info, GST_MAP_READ);
if (G_UNLIKELY (hls_stream->do_typefind)) { if (G_UNLIKELY (hls_stream->do_typefind)) {
GstCaps *caps = NULL; GstCaps *caps = NULL;
guint buffer_size; guint buffer_size;
GstTypeFindProbability prob = GST_TYPE_FIND_NONE; GstTypeFindProbability prob = GST_TYPE_FIND_NONE;
GstMapInfo info;
if (hls_stream->pending_typefind_buffer) if (hls_stream->pending_typefind_buffer)
buffer = gst_buffer_append (hls_stream->pending_typefind_buffer, buffer); buffer = gst_buffer_append (hls_stream->pending_typefind_buffer, buffer);
@ -859,11 +857,11 @@ gst_hls_demux_handle_buffer (GstAdaptiveDemux * demux,
gst_adaptive_demux_stream_set_caps (stream, caps); gst_adaptive_demux_stream_set_caps (stream, caps);
hls_stream->do_typefind = FALSE; hls_stream->do_typefind = FALSE;
gst_buffer_unmap (buffer, &info);
} }
g_assert (hls_stream->pending_typefind_buffer == NULL); g_assert (hls_stream->pending_typefind_buffer == NULL);
gst_buffer_unmap (buffer, &info);
// Accumulate this buffer // Accumulate this buffer
if (hls_stream->pending_pcr_buffer) { if (hls_stream->pending_pcr_buffer) {
buffer = gst_buffer_append (hls_stream->pending_pcr_buffer, buffer); buffer = gst_buffer_append (hls_stream->pending_pcr_buffer, buffer);