virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avcodec/qdm2: Move fft_order check up

Browse Source 
This avoids undefined computations with unchecked values

Fixes: shift exponent -21 is negative
Fixes: 15262/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5651261753393152

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8d8b8c4ac6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-06-17 20:58:47 +02:00
parent 1aa0c2a06f
commit 423d0bbc55
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/qdm2.c
View File

@ -1702,6 +1702,12 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx)
s->fft_order = av_log2(s->fft_size) + 1;
// Fail on unknown fft order
if ((s->fft_order < 7) || (s->fft_order > 9)) {
avpriv_request_sample(avctx, "Unknown FFT order %d", s->fft_order);
return AVERROR_PATCHWELCOME;
}
// something like max decodable tones
s->group_order = av_log2(s->group_size) + 1;
s->frame_size = s->group_size / 16; // 16 iterations per super block
@ -1735,11 +1741,6 @@ static av_cold int qdm2_decode_init(AVCodecContext *avctx)
else
s->coeff_per_sb_select = 2;
// Fail on unknown fft order
if ((s->fft_order < 7) || (s->fft_order > 9)) {
avpriv_request_sample(avctx, "Unknown FFT order %d", s->fft_order);
return AVERROR_PATCHWELCOME;
}
if (s->fft_size != (1 << (s->fft_order - 1))) {
av_log(avctx, AV_LOG_ERROR, "FFT size %d not power of 2.\n", s->fft_size);
return AVERROR_INVALIDDATA;