]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mpc8: correct integer overflow in mpc8_parse_seektable()
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 30 Oct 2020 20:50:32 +0000 (21:50 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 26 Nov 2020 23:25:42 +0000 (00:25 +0100)
Fixes: signed integer overflow: -4683718486770919638 * 2 cannot be represented in type 'long'
Fixes: 26704/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-6327056939614208
Fixes: 27550/clusterfuzz-testcase-minimized-ffmpeg_dem_MPC8_fuzzer-6259212652642304
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mpc8.c

index 2b5eefe8c34d0b959a5ed32fa935550779fcf311..a7ad908ca4427ccf7e741e9da1d575cc955a22b2 100644 (file)
@@ -182,7 +182,7 @@ static void mpc8_parse_seektable(AVFormatContext *s, int64_t off)
         t += get_bits(&gb, 12);
         if(t & 1)
             t = -(t & ~1);
-        pos = (t >> 1) + ppos[0]*2 - ppos[1];
+        pos = (t >> 1) + (uint64_t)ppos[0]*2 - ppos[1];
         av_add_index_entry(s->streams[0], pos, (int64_t)i << seekd, 0, 0, AVINDEX_KEYFRAME);
         ppos[1] = ppos[0];
         ppos[0] = pos;