]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/qdm2: Check fft_coefs_index
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 18 Feb 2020 21:58:12 +0000 (22:58 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 19 Feb 2020 21:37:30 +0000 (22:37 +0100)
Fixes: out of array access
Fixes: 20660/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5658290216501248
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qdm2.c

index 7b9d50b2343629d0d01b11836dd71d98790d5768..657b2da64dc8fa2721f37b25a70cf43e6f31bd88 100644 (file)
@@ -1334,6 +1334,9 @@ static void qdm2_fft_decode_tones(QDM2Context *q, int duration,
         if (q->frequency_range > (local_int_14 + 1)) {
             int sub_packet = (local_int_20 + local_int_28);
 
+            if (q->fft_coefs_index + stereo >= FF_ARRAY_ELEMS(q->fft_coefs))
+                return;
+
             qdm2_fft_init_coefficient(q, sub_packet, offset, duration,
                                       channel, exp, phase);
             if (stereo)