From a7c887b1975401d0fa4118ff8257eca25a6d8508 Mon Sep 17 00:00:00 2001 From: Havard Graff Date: Wed, 30 Nov 2016 15:55:01 +0100 Subject: [PATCH] rtpL16depay: don't crash if data is not modulo channels*width --- gst/rtp/gstrtpL16depay.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gst/rtp/gstrtpL16depay.c b/gst/rtp/gstrtpL16depay.c index e4aa71a..a249921 100644 --- a/gst/rtp/gstrtpL16depay.c +++ b/gst/rtp/gstrtpL16depay.c @@ -232,6 +232,7 @@ gst_rtp_L16_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) GstBuffer *outbuf; gint payload_len; gboolean marker; + GstAudioInfo *info; rtpL16depay = GST_RTP_L16_DEPAY (depayload); @@ -251,10 +252,15 @@ gst_rtp_L16_depay_process (GstRTPBaseDepayload * depayload, GstRTPBuffer * rtp) } outbuf = gst_buffer_make_writable (outbuf); + info = &rtpL16depay->info; + + if (payload_len % info->bpf != 0) + goto wrong_payload_size; + if (rtpL16depay->order && !gst_audio_buffer_reorder_channels (outbuf, - rtpL16depay->info.finfo->format, rtpL16depay->info.channels, - rtpL16depay->info.position, rtpL16depay->order->pos)) { + info->finfo->format, info->channels, + info->position, rtpL16depay->order->pos)) { goto reorder_failed; } @@ -269,6 +275,12 @@ empty_packet: ("Empty Payload."), (NULL)); return NULL; } +wrong_payload_size: + { + GST_ELEMENT_WARNING (rtpL16depay, STREAM, DECODE, + ("Wrong Payload Size."), (NULL)); + return NULL; + } reorder_failed: { GST_ELEMENT_ERROR (rtpL16depay, STREAM, DECODE, -- 2.7.4