mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-03 04:52:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtp: fix extension length calculation

Browse source
This commit is contained in:
Wim Taymans 2012-08-21 11:49:36 +02:00
parent f548e58385
commit 2d6fd0f72d
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
gst-libs/gst/rtp/gstrtpbuffer.c
View file

@ -316,6 +316,7 @@ gst_rtp_buffer_map (GstBuffer * buffer, GstMapFlags flags, GstRTPBuffer * rtp)
data = rtp->data[0] = rtp->map[0].data; data = rtp->data[0] = rtp->map[0].data;
size = rtp->map[0].size; size = rtp->map[0].size;
/* the header must be completely in the first buffer */
header_len = GST_RTP_HEADER_LEN; header_len = GST_RTP_HEADER_LEN;
if (G_UNLIKELY (size < header_len)) if (G_UNLIKELY (size < header_len))
goto wrong_length; goto wrong_length;
@ -338,7 +339,8 @@ gst_rtp_buffer_map (GstBuffer * buffer, GstMapFlags flags, GstRTPBuffer * rtp)
guint8 *extdata; guint8 *extdata;
guint16 extlen; guint16 extlen;
/* find memory for the extension bits */ /* find memory for the extension bits, we find the block for the first 4
* bytes, all other extension bytes should also be in this block */
if (!gst_buffer_find_memory (buffer, header_len, 4, &idx, &length, &skip)) if (!gst_buffer_find_memory (buffer, header_len, 4, &idx, &length, &skip))
goto wrong_length; goto wrong_length;
@ -350,8 +352,15 @@ gst_rtp_buffer_map (GstBuffer * buffer, GstMapFlags flags, GstRTPBuffer * rtp)
extdata += 2; extdata += 2;
/* read length as the number of 32 bits words */ /* read length as the number of 32 bits words */
extlen = GST_READ_UINT16_BE (extdata); extlen = GST_READ_UINT16_BE (extdata);
extlen *= sizeof (guint32);
/* add id and length */
extlen += 4;
rtp->size[1] = extlen * sizeof (guint32); /* all extension bytes must be in this block */
if (G_UNLIKELY (rtp->map[1].size < extlen))
goto wrong_length;
rtp->size[1] = extlen;
header_len += rtp->size[1]; header_len += rtp->size[1];
} else { } else {