mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtpgstpay: put 0-byte at the end of events

Browse source 
Put a 0-byte at the end of the event string. Does not break ABI because
old depayloaders will skip the 0 byte (which is included in the length).
Expect a 0-byte at the end of the event string or a ; for old
payloaders.

See https://bugzilla.gnome.org/show_bug.cgi?id=737591
This commit is contained in:
Wim Taymans 2014-11-20 13:14:14 +01:00
parent 9d2902d978
commit 3d7b0f30d7
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/rtp/gstrtpgstdepay.c
View file

@ -279,7 +279,12 @@ read_event (GstRtpGSTDepay * rtpgstdepay, guint type,
if (!read_length (rtpgstdepay, map.data, map.size, &length, &offset)) if (!read_length (rtpgstdepay, map.data, map.size, &length, &offset))
goto too_small; goto too_small;
if (length == 0 || map.data[offset + length - 1] != ';') if (length == 0)
goto invalid_buffer;
if (map.data[offset + length - 1] != '\0')
goto invalid_buffer;
/* backward compat, old payloader did not put 0-byte at the end */
if (map.data[offset + length - 1] != ';')
goto invalid_buffer; goto invalid_buffer;
GST_DEBUG_OBJECT (rtpgstdepay, "parsing event %s", &map.data[offset]); GST_DEBUG_OBJECT (rtpgstdepay, "parsing event %s", &map.data[offset]);

2
gst/rtp/gstrtpgstpay.c
View file

@ -483,6 +483,8 @@ gst_rtp_gst_pay_send_event (GstRtpGSTPay * rtpgstpay, guint etype,
estr = gst_structure_to_string (s); estr = gst_structure_to_string (s);
elen = strlen (estr); elen = strlen (estr);
/* for 0 byte */
elen++;
outbuf = make_data_buffer (rtpgstpay, estr, elen); outbuf = make_data_buffer (rtpgstpay, estr, elen);
GST_DEBUG_OBJECT (rtpgstpay, "sending event=%s", estr); GST_DEBUG_OBJECT (rtpgstpay, "sending event=%s", estr);
g_free (estr); g_free (estr);