mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 14:56:36 +00:00
multipartdemux: avoid reading from inavlid memory
Read the timestamp of the incomming buffer before we push it in the adapter and flush it out again as the buffer might be unreffed then and we read from invalid memory. Fixes #581444.
This commit is contained in:
parent
3f2144c5ee
commit
439ca2c795
1 changed files with 4 additions and 1 deletions
|
@ -469,6 +469,7 @@ gst_multipart_demux_chain (GstPad * pad, GstBuffer * buf)
|
|||
{
|
||||
GstMultipartDemux *multipart;
|
||||
GstAdapter *adapter;
|
||||
GstClockTime timestamp;
|
||||
gint size = 1;
|
||||
GstFlowReturn res;
|
||||
|
||||
|
@ -477,6 +478,8 @@ gst_multipart_demux_chain (GstPad * pad, GstBuffer * buf)
|
|||
|
||||
res = GST_FLOW_OK;
|
||||
|
||||
timestamp = GST_BUFFER_TIMESTAMP (buf);
|
||||
|
||||
if (GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DISCONT)) {
|
||||
gst_adapter_clear (adapter);
|
||||
}
|
||||
|
@ -518,7 +521,7 @@ gst_multipart_demux_chain (GstPad * pad, GstBuffer * buf)
|
|||
gst_pad_push_event (srcpad->pad, event);
|
||||
GST_BUFFER_TIMESTAMP (outbuf) = 0;
|
||||
} else {
|
||||
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
|
||||
GST_BUFFER_TIMESTAMP (outbuf) = timestamp;
|
||||
}
|
||||
GST_DEBUG_OBJECT (multipart,
|
||||
"pushing buffer with timestamp %" GST_TIME_FORMAT,
|
||||
|
|
Loading…
Reference in a new issue