mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-18 20:25:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mpegstream/gstmpegdemux.c: Add sanity check so we don't abort for broken or non-MPEG streams, but instead error o...

Browse source 
Original commit message from CVS:
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_subbuffer):
Add sanity check so we don't abort for broken or non-MPEG streams,
but instead error out. Fixes crashes/aborts for when our typefinder
wrongly identifies quicktime files as mpeg (which should be fixed in
-base now too). (#440120).
This commit is contained in:
Tim-Philipp Müller 2007-05-21 15:11:45 +00:00
parent c1146641e4
commit 527665dd95
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-05-21 Tim-Philipp Müller <tim at centricular dot net>
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_subbuffer):
Add sanity check so we don't abort for broken or non-MPEG streams,
but instead error out. Fixes crashes/aborts for when our typefinder
wrongly identifies quicktime files as mpeg (which should be fixed in
-base now too). (#440120).
2007-05-18 Stefan Kost <ensonic@users.sf.net>
* ext/amrnb/amrnbdec.c (gst_amrnbdec_debug, GST_CAT_DEFAULT,

15
gst/mpegstream/gstmpegdemux.c
View file

@ -1020,14 +1020,17 @@ gst_mpeg_demux_send_subbuffer (GstMPEGDemux * mpeg_demux,
} else {
GST_DEBUG_OBJECT (mpeg_demux, "Creating subbuffer size %d", size);
}
if (G_UNLIKELY (offset + size > GST_BUFFER_SIZE (buffer)))
goto broken_file;
outbuf = gst_buffer_create_sub (buffer, offset, size);
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (outstream->pad));
GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
GST_BUFFER_OFFSET (outbuf) = GST_BUFFER_OFFSET (buffer) + offset;
ret = gst_pad_push (outstream->pad, outbuf);
GST_LOG ("flow on %s: %s", GST_PAD_NAME (outstream->pad),
gst_flow_get_name (ret));
GST_LOG_OBJECT (outstream->pad, "flow: %s", gst_flow_get_name (ret));
++outstream->buffers_sent;
if (GST_CLOCK_TIME_IS_VALID (mpeg_demux->max_gap) &&
@ -1041,6 +1044,14 @@ gst_mpeg_demux_send_subbuffer (GstMPEGDemux * mpeg_demux,
ret = CLASS (mpeg_demux)->combine_flows (mpeg_demux, outstream, ret);
return ret;
/* ERRORS */
broken_file:
{
GST_ELEMENT_ERROR (mpeg_demux, STREAM, DEMUX, (NULL),
("Either broken file or not an MPEG stream"));
return GST_FLOW_ERROR;
}
}
static GstFlowReturn