History

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

Michael Niedermayer committed 5 years ago

Commit 4f70e1e1 parent 4dfb7ff1 file · +2 −4Browse files

Unified · Split

libavformat/mov.c+2−4
@@ -2354,12 +2354,10 @@ FF_ENABLE_DEPRECATION_WARNINGS · 2353 unmodified lines
23542354 if (tmcd_ctx->tmcd_flags & 0x0008) {
23552355 int timescale = AV_RB32(st->codecpar->extradata + 8);
23562356 int framedur = AV_RB32(st->codecpar->extradata + 12);
2357− st->avg_frame_rate.num *= timescale;
2358− st->avg_frame_rate.den *= framedur;
2357+ st->avg_frame_rate = av_mul_q(st->avg_frame_rate, (AVRational){timescale, framedur});
23592358 #if FF_API_LAVF_AVCTX
23602359 FF_DISABLE_DEPRECATION_WARNINGS
2361− st->codec->time_base.den *= timescale;
2362− st->codec->time_base.num *= framedur;
2360+ st->codec->time_base = av_mul_q(st->codec->time_base , (AVRational){framedur, timescale});
23632361 FF_ENABLE_DEPRECATION_WARNINGS
23642362 #endif
23652363 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t