mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpsource: protect against invalid RTP packets

Browse source
This commit is contained in:
Wim Taymans 2012-11-12 11:14:34 +01:00
parent 63fd591044
commit c755af0cb0
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst/rtpmanager/rtpsource.c
View file

@ -933,7 +933,9 @@ calculate_jitter (RTPSource * src, GstBuffer * buffer,
if ((running_time = arrival->running_time) == GST_CLOCK_TIME_NONE) if ((running_time = arrival->running_time) == GST_CLOCK_TIME_NONE)
goto no_time; goto no_time;
gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp); if (!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp))
goto invalid_packet;
pt = gst_rtp_buffer_get_payload_type (&rtp); pt = gst_rtp_buffer_get_payload_type (&rtp);
GST_LOG ("SSRC %08x got payload %d", src->ssrc, pt); GST_LOG ("SSRC %08x got payload %d", src->ssrc, pt);
@ -982,6 +984,11 @@ no_time:
GST_WARNING ("cannot get current running_time"); GST_WARNING ("cannot get current running_time");
return; return;
} }
invalid_packet:
{
GST_WARNING ("invalid RTP packet");
return;
}
no_clock_rate: no_clock_rate:
{ {
GST_WARNING ("cannot get clock-rate for pt %d", pt); GST_WARNING ("cannot get clock-rate for pt %d", pt);
@ -1063,7 +1070,9 @@ rtp_source_process_rtp (RTPSource * src, GstBuffer * buffer,
stats = &src->stats; stats = &src->stats;
gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp); if (!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp))
goto invalid_packet;
seqnr = gst_rtp_buffer_get_seq (&rtp); seqnr = gst_rtp_buffer_get_seq (&rtp);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
@ -1155,6 +1164,12 @@ done:
return result; return result;
/* ERRORS */ /* ERRORS */
invalid_packet:
{
GST_WARNING ("invalid packet received");
gst_buffer_unref (buffer);
return GST_FLOW_OK;
}
bad_sequence: bad_sequence:
{ {
GST_WARNING ("unacceptable seqnum received"); GST_WARNING ("unacceptable seqnum received");
@ -1199,9 +1214,10 @@ set_ssrc (GstBuffer ** buffer, guint idx, RTPSource * src)
GstRTPBuffer rtp = { NULL }; GstRTPBuffer rtp = { NULL };
*buffer = gst_buffer_make_writable (*buffer); *buffer = gst_buffer_make_writable (*buffer);
gst_rtp_buffer_map (*buffer, GST_MAP_WRITE, &rtp); if (gst_rtp_buffer_map (*buffer, GST_MAP_WRITE, &rtp)) {
gst_rtp_buffer_set_ssrc (&rtp, src->ssrc); gst_rtp_buffer_set_ssrc (&rtp, src->ssrc);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
}
return TRUE; return TRUE;
} }
@ -1257,7 +1273,10 @@ rtp_source_send_rtp (RTPSource * src, gpointer data, gboolean is_list,
/* Each group makes up a network packet. */ /* Each group makes up a network packet. */
packets = gst_buffer_list_length (list); packets = gst_buffer_list_length (list);
for (i = 0, len = 0; i < packets; i++) { for (i = 0, len = 0; i < packets; i++) {
gst_rtp_buffer_map (gst_buffer_list_get (list, i), GST_MAP_READ, &rtp); if (!gst_rtp_buffer_map (gst_buffer_list_get (list, i), GST_MAP_READ,
&rtp))
goto invalid_packet;
len += gst_rtp_buffer_get_payload_len (&rtp); len += gst_rtp_buffer_get_payload_len (&rtp);
gst_rtp_buffer_unmap (&rtp); gst_rtp_buffer_unmap (&rtp);
} }
@ -1265,7 +1284,9 @@ rtp_source_send_rtp (RTPSource * src, gpointer data, gboolean is_list,
gst_rtp_buffer_map (gst_buffer_list_get (list, 0), GST_MAP_READ, &rtp); gst_rtp_buffer_map (gst_buffer_list_get (list, 0), GST_MAP_READ, &rtp);
} else { } else {
packets = 1; packets = 1;
gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp); if (!gst_rtp_buffer_map (buffer, GST_MAP_READ, &rtp))
goto invalid_packet;
len = gst_rtp_buffer_get_payload_len (&rtp); len = gst_rtp_buffer_get_payload_len (&rtp);
} }
@ -1334,6 +1355,12 @@ rtp_source_send_rtp (RTPSource * src, gpointer data, gboolean is_list,
return result; return result;
/* ERRORS */ /* ERRORS */
invalid_packet:
{
GST_WARNING ("invalid packet received");
gst_mini_object_unref (GST_MINI_OBJECT_CAST (data));
return GST_FLOW_OK;
}
no_buffer: no_buffer:
{ {
GST_WARNING ("no buffers in buffer list"); GST_WARNING ("no buffers in buffer list");