From 62d6f5c78af0bc0b010de224f3a569dfd85c216d Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 29 Aug 2017 10:37:11 +0200 Subject: [PATCH] tsdemux: Properly error out on jp2k parsing errors Avoids crashes later on where we assume buffer exists --- gst/mpegtsdemux/tsdemux.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c index a570a1c6af..f802ae0ff7 100644 --- a/gst/mpegtsdemux/tsdemux.c +++ b/gst/mpegtsdemux/tsdemux.c @@ -2842,6 +2842,10 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream, } } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K) { buffer = parse_jp2k_access_unit (stream); + if (!buffer) { + res = GST_FLOW_ERROR; + goto beach; + } } else { buffer = gst_buffer_new_wrapped (stream->data, stream->current_size); } @@ -2878,6 +2882,10 @@ gst_ts_demux_push_pending_data (GstTSDemux * demux, TSDemuxStream * stream, } } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K) { buffer = parse_jp2k_access_unit (stream); + if (!buffer) { + res = GST_FLOW_ERROR; + goto beach; + } } else { buffer = gst_buffer_new_wrapped (stream->data, stream->current_size); }