Commit 061a592b authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/movenc: Check that track_width_1616 fits within the available 32bit before storing it

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 14bc5704
...@@ -2371,7 +2371,9 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov, ...@@ -2371,7 +2371,9 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVMuxContext *mov,
int64_t track_width_1616 = av_rescale(st->sample_aspect_ratio.num, int64_t track_width_1616 = av_rescale(st->sample_aspect_ratio.num,
track->enc->width * 0x10000LL, track->enc->width * 0x10000LL,
st->sample_aspect_ratio.den); st->sample_aspect_ratio.den);
if (!track_width_1616 || track->height != track->enc->height) if (!track_width_1616 ||
track->height != track->enc->height ||
track_width_1616 > UINT32_MAX)
track_width_1616 = track->enc->width * 0x10000; track_width_1616 = track->enc->width * 0x10000;
avio_wb32(pb, track_width_1616); avio_wb32(pb, track_width_1616);
avio_wb32(pb, track->height * 0x10000); avio_wb32(pb, track->height * 0x10000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment