mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-30 04:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

avcodecmap: Don't try converting channel layouts with more than 64 channels

Browse source 
We only support up to 64 channels in GStreamer with a specific layout so
it's safe to assume a NONE layout in this case.

Also the arrays of channel positions are allocated everywhere with 64
elements so don't try setting more than 64 to NONE as that will cause
stack corruptions and similar memory safety issues.

Thanks to Natalie Silvanovich for reporting this issue.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-libav/-/issues/92

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-libav/-/merge_requests/120>
This commit is contained in:
Sebastian Dröge 2021-03-03 10:51:04 +02:00
parent 1d33d1c8ea
commit dcea8baa14
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/libav/gstavcodecmap.c
View file

@ -102,7 +102,7 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout, gint channels,
guint nchannels = 0; guint nchannels = 0;
gboolean none_layout = FALSE; gboolean none_layout = FALSE;
if (channel_layout == 0) { if (channel_layout == 0 || channels > 64) {
nchannels = channels; nchannels = channels;
none_layout = TRUE; none_layout = TRUE;
} else { } else {
@ -163,7 +163,7 @@ gst_ffmpeg_channel_layout_to_gst (guint64 channel_layout, gint channels,
} else { } else {
guint i; guint i;
for (i = 0; i < nchannels; i++) for (i = 0; i < nchannels && i < 64; i++)
pos[i] = GST_AUDIO_CHANNEL_POSITION_NONE; pos[i] = GST_AUDIO_CHANNEL_POSITION_NONE;
} }
} }