rtpst2022-1-fecdec: don't xor out of bounds
authorMathieu Duponchelle <mathieu@centricular.com>
Sat, 12 Dec 2020 03:02:37 +0000 (04:02 +0100)
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Sat, 12 Dec 2020 09:29:15 +0000 (09:29 +0000)
When reconstituting packets from a stream with variable packet
sizes, don't xor larger packets past the length of the protected
packet

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/839>

gst/rtpmanager/gstrtpst2022-1-fecdec.c

index 8bbc14d..3bf86db 100644 (file)
@@ -440,7 +440,7 @@ xor_items (GstRTPST_2022_1_FecDec * dec, Rtp2DFecHeader * fec, GList * packets,
 
     gst_rtp_buffer_map (item->buffer, GST_MAP_READ, &media_rtp);
     _xor_mem (xored, gst_rtp_buffer_get_payload (&media_rtp),
-        gst_rtp_buffer_get_payload_len (&media_rtp));
+        MIN (gst_rtp_buffer_get_payload_len (&media_rtp), xored_payload_len));
     xored_timestamp ^= gst_rtp_buffer_get_timestamp (&media_rtp);
     xored_pt ^= gst_rtp_buffer_get_payload_type (&media_rtp);
     xored_marker ^= gst_rtp_buffer_get_marker (&media_rtp);