mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-03-01 18:21:04 +00:00
avformat/mov: Use av_mul_q() to avoid integer overflows
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 4f70e1ec0c
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
45995534b2
commit
bba37dfe0f
@ -2321,12 +2321,10 @@ FF_ENABLE_DEPRECATION_WARNINGS
|
||||
if (tmcd_ctx->tmcd_flags & 0x0008) {
|
||||
int timescale = AV_RB32(st->codecpar->extradata + 8);
|
||||
int framedur = AV_RB32(st->codecpar->extradata + 12);
|
||||
st->avg_frame_rate.num *= timescale;
|
||||
st->avg_frame_rate.den *= framedur;
|
||||
st->avg_frame_rate = av_mul_q(st->avg_frame_rate, (AVRational){timescale, framedur});
|
||||
#if FF_API_LAVF_AVCTX
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
st->codec->time_base.den *= timescale;
|
||||
st->codec->time_base.num *= framedur;
|
||||
st->codec->time_base = av_mul_q(st->codec->time_base , (AVRational){framedur, timescale});
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user