highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: Use av_mul_q() to avoid integer overflows

Browse Source 
Fixes: signed integer overflow: 538976288 * 538976288 cannot be represented in type 'int'
Fixes: 27473/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5758978289827840

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 4f70e1ec0cfa8ae24b224faf522c1d6ca95a42f6)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-11-22 19:13:01 +01:00
parent 45995534b2
commit bba37dfe0f
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mov.c
View File

@ -2321,12 +2321,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (tmcd_ctx->tmcd_flags & 0x0008) { if (tmcd_ctx->tmcd_flags & 0x0008) {
int timescale = AV_RB32(st->codecpar->extradata + 8); int timescale = AV_RB32(st->codecpar->extradata + 8);
int framedur = AV_RB32(st->codecpar->extradata + 12); int framedur = AV_RB32(st->codecpar->extradata + 12);
st->avg_frame_rate.num *= timescale; st->avg_frame_rate = av_mul_q(st->avg_frame_rate, (AVRational){timescale, framedur});
st->avg_frame_rate.den *= framedur;
#if FF_API_LAVF_AVCTX #if FF_API_LAVF_AVCTX
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
st->codec->time_base.den *= timescale; st->codec->time_base = av_mul_q(st->codec->time_base , (AVRational){framedur, timescale});
st->codec->time_base.num *= framedur;
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
} }