[FFmpeg-cvslog] avcodec/qdm2: Move fft_order check up
Michael Niedermayer
git at videolan.org
Sat Jun 29 20:24:40 EEST 2019
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jun 17 20:58:47 2019 +0200| [8d8b8c4ac6fb5b5d40bd131f2d2ea9d85b8759a6] | committer: Michael Niedermayer
avcodec/qdm2: Move fft_order check up
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d8b8c4ac6fb5b5d40bd131f2d2ea9d85b8759a6
---
libavcodec/qdm2.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 88b6b19d11..1397218bdd 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -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;
More information about the ffmpeg-cvslog
mailing list