mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 02:01:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

hlsdemux2: Fix typefind leak and invalid memory access

Browse source 
When typefinding aggregates incoming data to a pending
typefind buffer and then succeeds in typefinding, it
leaks the aggregated buffer, and leaves the caller
accessing an unreffed buffer.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2873>
This commit is contained in:
Jan Schmidt 2022-08-11 05:03:10 +10:00 committed by GStreamer Marge Bot
parent a6eb725413
commit a242428532
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
subprojects/gst-plugins-good/ext/adaptivedemux2/hls/gsthlsdemux.c
View file

@ -1119,10 +1119,14 @@ caps_to_parser_type (const GstCaps * caps)
* *
* Will also setup the appropriate parser (tsreader) if needed * Will also setup the appropriate parser (tsreader) if needed
* *
* Consumes the input buffer when it returns FALSE, but
* replaces / returns the input buffer in the `buffer` parameter
* when it returns TRUE.
*
* Returns TRUE if we are done with typefinding */ * Returns TRUE if we are done with typefinding */
static gboolean static gboolean
gst_hls_demux_typefind_stream (GstHLSDemux * hlsdemux, gst_hls_demux_typefind_stream (GstHLSDemux * hlsdemux,
GstAdaptiveDemux2Stream * stream, GstBuffer * buffer, gboolean at_eos, GstAdaptiveDemux2Stream * stream, GstBuffer ** out_buffer, gboolean at_eos,
GstFlowReturn * ret) GstFlowReturn * ret)
{ {
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
@ -1130,10 +1134,15 @@ gst_hls_demux_typefind_stream (GstHLSDemux * hlsdemux,
guint buffer_size; guint buffer_size;
GstTypeFindProbability prob = GST_TYPE_FIND_NONE; GstTypeFindProbability prob = GST_TYPE_FIND_NONE;
GstMapInfo info; GstMapInfo info;
GstBuffer *buffer = *out_buffer;
if (hls_stream->pending_typefind_buffer) if (hls_stream->pending_typefind_buffer) {
buffer = gst_buffer_append (hls_stream->pending_typefind_buffer, buffer); /* Append to the existing typefind buffer and create a new one that
hls_stream->pending_typefind_buffer = NULL; * we'll return (or consume below) */
buffer = *out_buffer =
gst_buffer_append (hls_stream->pending_typefind_buffer, buffer);
hls_stream->pending_typefind_buffer = NULL;
}
gst_buffer_map (buffer, &info, GST_MAP_READ); gst_buffer_map (buffer, &info, GST_MAP_READ);
buffer_size = info.size; buffer_size = info.size;
@ -1159,9 +1168,10 @@ gst_hls_demux_typefind_stream (GstHLSDemux * hlsdemux,
*ret = GST_FLOW_NOT_NEGOTIATED; *ret = GST_FLOW_NOT_NEGOTIATED;
} else { } else {
GST_LOG_OBJECT (stream, "Not enough data to typefind"); GST_LOG_OBJECT (stream, "Not enough data to typefind");
hls_stream->pending_typefind_buffer = buffer; hls_stream->pending_typefind_buffer = buffer; /* Transfer the ref */
*ret = GST_FLOW_OK; *ret = GST_FLOW_OK;
} }
*out_buffer = NULL;
return FALSE; return FALSE;
} }
@ -1175,6 +1185,7 @@ gst_hls_demux_typefind_stream (GstHLSDemux * hlsdemux,
"Unsupported stream type %" GST_PTR_FORMAT, caps); "Unsupported stream type %" GST_PTR_FORMAT, caps);
GST_MEMDUMP_OBJECT (stream, "unknown data", info.data, GST_MEMDUMP_OBJECT (stream, "unknown data", info.data,
MIN (info.size, 128)); MIN (info.size, 128));
gst_buffer_unref (buffer);
*ret = GST_FLOW_ERROR; *ret = GST_FLOW_ERROR;
return FALSE; return FALSE;
} }
@ -1188,7 +1199,7 @@ gst_hls_demux_typefind_stream (GstHLSDemux * hlsdemux,
gst_buffer_unmap (buffer, &info); gst_buffer_unmap (buffer, &info);
/* We are done with typefinding */ /* We are done with typefinding. Doesn't consume the input buffer */
*ret = GST_FLOW_OK; *ret = GST_FLOW_OK;
return TRUE; return TRUE;
} }
@ -1499,8 +1510,10 @@ gst_hls_demux_handle_buffer (GstAdaptiveDemux * demux,
/* If we need to do typefind and we're not done with it (or we errored), return */ /* If we need to do typefind and we're not done with it (or we errored), return */
if (G_UNLIKELY (hls_stream->do_typefind) && if (G_UNLIKELY (hls_stream->do_typefind) &&
!gst_hls_demux_typefind_stream (hlsdemux, stream, buffer, at_eos, &ret)) !gst_hls_demux_typefind_stream (hlsdemux, stream, &buffer, at_eos,
&ret)) {
goto out; goto out;
}
g_assert (hls_stream->pending_typefind_buffer == NULL); g_assert (hls_stream->pending_typefind_buffer == NULL);
if (hls_stream->process_buffer_content) { if (hls_stream->process_buffer_content) {