xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vorbisdec: reject channel mapping with less than two channels

Browse Source 
It causes the angle channel number to equal the magnitude channel
number, which makes the stream undecodable according to the
specification.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit b4b13848de)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-01-03 19:20:54 +01:00
parent 3b535bbf88
commit b6fb6ccda4
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/vorbisdec.c
+5
View File
@@ -784,6 +784,11 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc)
if (get_bits1(gb)) {
mapping_setup->coupling_steps = get_bits(gb, 8) + 1;
if (vc->audio_channels < 2) {
av_log(vc->avctx, AV_LOG_ERROR,
"Square polar channel mapping with less than two channels is not compliant with the Vorbis I specification.\n");
return AVERROR_INVALIDDATA;
}
mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps *
sizeof(*mapping_setup->magnitude));
mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps *