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
2354 if (tmcd_ctx->tmcd_flags & 0x0008) {2354 if (tmcd_ctx->tmcd_flags & 0x0008) {
2355 int timescale = AV_RB32(st->codecpar->extradata + 8);2355 int timescale = AV_RB32(st->codecpar->extradata + 8);
2356 int framedur = AV_RB32(st->codecpar->extradata + 12);2356 int framedur = AV_RB32(st->codecpar->extradata + 12);
2357 st->avg_frame_rate.num *= timescale;2357 st->avg_frame_rate = av_mul_q(st->avg_frame_rate, (AVRational){timescale, framedur});
2358 st->avg_frame_rate.den *= framedur;
2359#if FF_API_LAVF_AVCTX2358#if FF_API_LAVF_AVCTX
2360FF_DISABLE_DEPRECATION_WARNINGS2359FF_DISABLE_DEPRECATION_WARNINGS
2361 st->codec->time_base.den *= timescale;2360 st->codec->time_base = av_mul_q(st->codec->time_base , (AVRational){framedur, timescale});
2362 st->codec->time_base.num *= framedur;
2363FF_ENABLE_DEPRECATION_WARNINGS2361FF_ENABLE_DEPRECATION_WARNINGS
2364#endif2362#endif
2365 }2363 }

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