Commit 05059ce1 authored by Nicolas Dufresne's avatar Nicolas Dufresne

rtph264pay/rtph265pay: Fix use after free

We can't assume a buffer that has been pushed in the adapter is still
valid. This fixes a use after free detect when running test on jenkins.
parent b01210c5
...@@ -1025,6 +1025,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1025,6 +1025,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
gsize skip; gsize skip;
gboolean delayed_not_delta_unit = FALSE; gboolean delayed_not_delta_unit = FALSE;
gboolean delayed_discont = FALSE; gboolean delayed_discont = FALSE;
gboolean marker = FALSE;
gboolean draining = (buffer == NULL);
rtph264pay = GST_RTP_H264_PAY (basepayload); rtph264pay = GST_RTP_H264_PAY (basepayload);
...@@ -1033,8 +1035,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1033,8 +1035,8 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
avc = rtph264pay->stream_format == GST_H264_STREAM_FORMAT_AVC; avc = rtph264pay->stream_format == GST_H264_STREAM_FORMAT_AVC;
if (avc) { if (avc) {
/* In AVC mode, there is no adapter, so nothign to flush */ /* In AVC mode, there is no adapter, so nothign to drain */
if (buffer == NULL) if (draining)
return GST_FLOW_OK; return GST_FLOW_OK;
gst_buffer_map (buffer, &map, GST_MAP_READ); gst_buffer_map (buffer, &map, GST_MAP_READ);
data = map.data; data = map.data;
...@@ -1044,6 +1046,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1044,6 +1046,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
rtph264pay->delta_unit = GST_BUFFER_FLAG_IS_SET (buffer, rtph264pay->delta_unit = GST_BUFFER_FLAG_IS_SET (buffer,
GST_BUFFER_FLAG_DELTA_UNIT); GST_BUFFER_FLAG_DELTA_UNIT);
rtph264pay->discont = GST_BUFFER_IS_DISCONT (buffer); rtph264pay->discont = GST_BUFFER_IS_DISCONT (buffer);
marker = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER);
GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size); GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size);
} else { } else {
if (buffer) { if (buffer) {
...@@ -1067,7 +1070,9 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1067,7 +1070,9 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
delayed_discont = TRUE; delayed_discont = TRUE;
} }
marker = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER);
gst_adapter_push (rtph264pay->adapter, buffer); gst_adapter_push (rtph264pay->adapter, buffer);
buffer = NULL;
} }
/* We want to use the first TS used to construct the following NAL */ /* We want to use the first TS used to construct the following NAL */
...@@ -1079,9 +1084,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1079,9 +1084,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
if (size == 0) if (size == 0)
return GST_FLOW_OK; return GST_FLOW_OK;
data = gst_adapter_map (rtph264pay->adapter, size); data = gst_adapter_map (rtph264pay->adapter, size);
GST_DEBUG_OBJECT (basepayload, GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size);
"got %" G_GSIZE_FORMAT " bytes (%" G_GSIZE_FORMAT ")", size,
buffer ? gst_buffer_get_size (buffer) : 0);
} }
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
...@@ -1122,8 +1125,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1122,8 +1125,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
* access unit * access unit
*/ */
if (size - nal_len <= nal_length_size) { if (size - nal_len <= nal_length_size) {
if (rtph264pay->alignment == GST_H264_ALIGNMENT_AU || if (rtph264pay->alignment == GST_H264_ALIGNMENT_AU || marker)
GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER))
end_of_au = TRUE; end_of_au = TRUE;
} }
...@@ -1184,7 +1186,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1184,7 +1186,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
next = next_start_code (data, size); next = next_start_code (data, size);
/* nal or au aligned input needs no delaying until next time */ /* nal or au aligned input needs no delaying until next time */
if (next == size && buffer != NULL && if (next == size && !draining &&
rtph264pay->alignment == GST_H264_ALIGNMENT_UNKNOWN) { rtph264pay->alignment == GST_H264_ALIGNMENT_UNKNOWN) {
/* Didn't find the start of next NAL and it's not EOS, /* Didn't find the start of next NAL and it's not EOS,
* handle it next time */ * handle it next time */
...@@ -1252,7 +1254,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1252,7 +1254,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
* trailing 0x0 that can be discarded */ * trailing 0x0 that can be discarded */
size = nal_len; size = nal_len;
data = gst_adapter_map (rtph264pay->adapter, size); data = gst_adapter_map (rtph264pay->adapter, size);
if (i + 1 != nal_queue->len || buffer != NULL) if (i + 1 != nal_queue->len || !draining)
for (; size > 1 && data[size - 1] == 0x0; size--) for (; size > 1 && data[size - 1] == 0x0; size--)
/* skip */ ; /* skip */ ;
...@@ -1266,8 +1268,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1266,8 +1268,7 @@ gst_rtp_h264_pay_handle_buffer (GstRTPBasePayload * basepayload,
*/ */
if (i == nal_queue->len - 1) { if (i == nal_queue->len - 1) {
if (rtph264pay->alignment == GST_H264_ALIGNMENT_AU || if (rtph264pay->alignment == GST_H264_ALIGNMENT_AU ||
buffer == NULL || marker || draining)
GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER))
end_of_au = TRUE; end_of_au = TRUE;
} }
paybuf = gst_adapter_take_buffer (rtph264pay->adapter, size); paybuf = gst_adapter_take_buffer (rtph264pay->adapter, size);
......
...@@ -1113,6 +1113,8 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1113,6 +1113,8 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
gboolean hevc; gboolean hevc;
GstBuffer *paybuf = NULL; GstBuffer *paybuf = NULL;
gsize skip; gsize skip;
gboolean marker = FALSE;
gboolean draining = (buffer == NULL);
rtph265pay = GST_RTP_H265_PAY (basepayload); rtph265pay = GST_RTP_H265_PAY (basepayload);
...@@ -1122,18 +1124,22 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1122,18 +1124,22 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
|| (rtph265pay->stream_format == GST_H265_STREAM_FORMAT_HVC1); || (rtph265pay->stream_format == GST_H265_STREAM_FORMAT_HVC1);
if (hevc) { if (hevc) {
/* In hevc mode, there is no adapter, so nothing to flush */ /* In hevc mode, there is no adapter, so nothing to drain */
if (buffer == NULL) if (draining)
return GST_FLOW_OK; return GST_FLOW_OK;
gst_buffer_map (buffer, &map, GST_MAP_READ); gst_buffer_map (buffer, &map, GST_MAP_READ);
data = map.data; data = map.data;
size = map.size; size = map.size;
pts = GST_BUFFER_PTS (buffer); pts = GST_BUFFER_PTS (buffer);
dts = GST_BUFFER_DTS (buffer); dts = GST_BUFFER_DTS (buffer);
marker = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER);
GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size); GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size);
} else { } else {
if (buffer) if (buffer) {
marker = GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER);
gst_adapter_push (rtph265pay->adapter, buffer); gst_adapter_push (rtph265pay->adapter, buffer);
buffer = NULL;
}
/* We want to use the first TS used to construct the following NAL */ /* We want to use the first TS used to construct the following NAL */
dts = gst_adapter_prev_dts (rtph265pay->adapter, NULL); dts = gst_adapter_prev_dts (rtph265pay->adapter, NULL);
...@@ -1144,9 +1150,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1144,9 +1150,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
if (size == 0) if (size == 0)
return GST_FLOW_OK; return GST_FLOW_OK;
data = gst_adapter_map (rtph265pay->adapter, size); data = gst_adapter_map (rtph265pay->adapter, size);
GST_DEBUG_OBJECT (basepayload, GST_DEBUG_OBJECT (basepayload, "got %" G_GSIZE_FORMAT " bytes", size);
"got %" G_GSIZE_FORMAT " bytes (%" G_GSIZE_FORMAT ")", size,
buffer ? gst_buffer_get_size (buffer) : 0);
} }
ret = GST_FLOW_OK; ret = GST_FLOW_OK;
...@@ -1193,8 +1197,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1193,8 +1197,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
*/ */
GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER); GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER);
if (size - nal_len <= nal_length_size) { if (size - nal_len <= nal_length_size) {
if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU || if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU || marker)
GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER))
GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER); GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER);
} }
...@@ -1242,7 +1245,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1242,7 +1245,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
next = next_start_code (data, size); next = next_start_code (data, size);
/* nal or au aligned input needs no delaying until next time */ /* nal or au aligned input needs no delaying until next time */
if (next == size && buffer != NULL && if (next == size && !draining &&
rtph265pay->alignment == GST_H265_ALIGNMENT_UNKNOWN) { rtph265pay->alignment == GST_H265_ALIGNMENT_UNKNOWN) {
/* Didn't find the start of next NAL and it's not EOS, /* Didn't find the start of next NAL and it's not EOS,
* handle it next time */ * handle it next time */
...@@ -1291,7 +1294,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1291,7 +1294,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
* trailing 0x0 that can be discarded */ * trailing 0x0 that can be discarded */
size = nal_len; size = nal_len;
data = gst_adapter_map (rtph265pay->adapter, size); data = gst_adapter_map (rtph265pay->adapter, size);
if (i + 1 != nal_queue->len || buffer != NULL) if (i + 1 != nal_queue->len || !draining)
for (; size > 1 && data[size - 1] == 0x0; size--) for (; size > 1 && data[size - 1] == 0x0; size--)
/* skip */ ; /* skip */ ;
...@@ -1304,8 +1307,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload, ...@@ -1304,8 +1307,7 @@ gst_rtp_h265_pay_handle_buffer (GstRTPBasePayload * basepayload,
GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER); GST_BUFFER_FLAG_UNSET (paybuf, GST_BUFFER_FLAG_MARKER);
if (i == nal_queue->len - 1) { if (i == nal_queue->len - 1) {
if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU || if (rtph265pay->alignment == GST_H265_ALIGNMENT_AU ||
buffer == NULL || marker || draining)
GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_MARKER))
GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER); GST_BUFFER_FLAG_SET (paybuf, GST_BUFFER_FLAG_MARKER);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment