aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-03 02:49:44 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-06 12:40:48 +0100
commite5c9396a029322b1a43e24b6dbe1cb2ec76bf0f1 (patch)
treea1fcb27983edbbc22947b96e430e1244749980a0
parent6f08086992c3fad68fbaca03b0ca2a42f0ad0d67 (diff)
downloadffmpeg-e5c9396a029322b1a43e24b6dbe1cb2ec76bf0f1.tar.gz
avformat/dump: Fix integer overflow in aspect ratio calculation
Fixes: unknown_unknown_19e_414_cov_764838672_bellhamlam.mov Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d1bdaf3fb2c45020f72a378bb64eab1bf136581c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/dump.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c
index 3a7adbe014..c4434b3e0b 100644
--- a/libavformat/dump.c
+++ b/libavformat/dump.c
@@ -363,8 +363,8 @@ static void dump_stream_format(AVFormatContext *ic, int i,
av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)) {
AVRational display_aspect_ratio;
av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
- st->codec->width * st->sample_aspect_ratio.num,
- st->codec->height * st->sample_aspect_ratio.den,
+ st->codec->width * (int64_t)st->sample_aspect_ratio.num,
+ st->codec->height * (int64_t)st->sample_aspect_ratio.den,
1024 * 1024);
av_log(NULL, AV_LOG_INFO, ", SAR %d:%d DAR %d:%d",
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,