mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

tsdemux: Properly error out on jp2k parsing errors

Browse source 
Avoids crashes later on where we assume buffer exists
This commit is contained in:
Edward Hervey 2017-08-29 10:37:11 +02:00 committed by Edward Hervey
parent 63c582d685
commit 62d6f5c78a
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/mpegtsdemux/tsdemux.c
View file

@ -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) { } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K) {
buffer = parse_jp2k_access_unit (stream); buffer = parse_jp2k_access_unit (stream);
if (!buffer) {
res = GST_FLOW_ERROR;
goto beach;
}
} else { } else {
buffer = gst_buffer_new_wrapped (stream->data, stream->current_size); 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) { } else if (bs->stream_type == GST_MPEGTS_STREAM_TYPE_VIDEO_JP2K) {
buffer = parse_jp2k_access_unit (stream); buffer = parse_jp2k_access_unit (stream);
if (!buffer) {
res = GST_FLOW_ERROR;
goto beach;
}
} else { } else {
buffer = gst_buffer_new_wrapped (stream->data, stream->current_size); buffer = gst_buffer_new_wrapped (stream->data, stream->current_size);
} }