Skip to content

F
ffmpeg.wasm-core
Commit 405e99bd authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

vorbisdec: Make sure blocksize is not set to an invalid value. 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 6fcf2bb8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/vorbisdec.c
View file @ 405e99bd
...@@ -935,12 +935,12 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) ...@@ -935,12 +935,12 @@ static int vorbis_parse_id_hdr(vorbis_context *vc)
vc->bitrate_minimum = get_bits_long(gb, 32); vc->bitrate_minimum = get_bits_long(gb, 32);
bl0 = get_bits(gb, 4); bl0 = get_bits(gb, 4);
bl1 = get_bits(gb, 4); bl1 = get_bits(gb, 4);
vc->blocksize[0] = (1 << bl0);
vc->blocksize[1] = (1 << bl1);
if (bl0 > 13 || bl0 < 6 || bl1 > 13 || bl1 < 6 || bl1 < bl0) { if (bl0 > 13 || bl0 < 6 || bl1 > 13 || bl1 < 6 || bl1 < bl0) {
av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n"); av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
vc->blocksize[0] = (1 << bl0);
vc->blocksize[1] = (1 << bl1);
vc->win[0] = ff_vorbis_vwin[bl0 - 6]; vc->win[0] = ff_vorbis_vwin[bl0 - 6];
vc->win[1] = ff_vorbis_vwin[bl1 - 6]; vc->win[1] = ff_vorbis_vwin[bl1 - 6];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment