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

matroskademux: Skip over laces directly when postprocessing the frame fails

Browse source 
Otherwise NULL buffers might be handled afterwards.

Thanks to Antonio Morales for finding and reporting the issue.

Fixes GHSL-2024-249
Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3865

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/8057>
This commit is contained in:
Sebastian Dröge 2024-09-30 19:06:03 +03:00 committed by GStreamer Marge Bot
parent 395f2b3ffd
commit c20eff779d
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/gst-plugins-good/gst/matroska/matroska-demux.c
View file

@ -4988,6 +4988,18 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux,
if (stream->postprocess_frame) { if (stream->postprocess_frame) {
GST_LOG_OBJECT (demux, "running post process"); GST_LOG_OBJECT (demux, "running post process");
ret = stream->postprocess_frame (GST_ELEMENT (demux), stream, &sub); ret = stream->postprocess_frame (GST_ELEMENT (demux), stream, &sub);
if (ret != GST_FLOW_OK) {
gst_clear_buffer (&sub);
goto next_lace;
}
if (sub == NULL) {
GST_WARNING_OBJECT (demux,
"Postprocessing buffer with timestamp %" GST_TIME_FORMAT
" for stream %d failed", GST_TIME_ARGS (buffer_timestamp),
stream_num);
goto next_lace;
}
} }
/* At this point, we have a sub-buffer pointing at data within a larger /* At this point, we have a sub-buffer pointing at data within a larger