]> git.sesse.net Git - ffmpeg/commitdiff
avutil/timecode: Avoid undefined behavior with large framenum
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 28 Nov 2020 20:31:16 +0000 (21:31 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 18 Jan 2021 23:05:50 +0000 (00:05 +0100)
Fixes: signed integer overflow: 2147462079 + 2149596 cannot be represented in type 'int'
Fixes: 27565/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5091972813160448
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavutil/timecode.c

index 5106f642b97031d818fb6f6388ac39275f00b6a6..280e4cacfb34f188c0d78d9161a437c545adf39b 100644 (file)
@@ -46,7 +46,7 @@ int av_timecode_adjust_ntsc_framenum2(int framenum, int fps)
     d = framenum / frames_per_10mins;
     m = framenum % frames_per_10mins;
 
-    return framenum + 9 * drop_frames * d + drop_frames * ((m - drop_frames) / (frames_per_10mins / 10));
+    return framenum + 9U * drop_frames * d + drop_frames * ((m - drop_frames) / (frames_per_10mins / 10));
 }
 
 uint32_t av_timecode_get_smpte_from_framenum(const AVTimecode *tc, int framenum)