mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/mov: Check offset addition for overflow
Fixes: signed integer overflow: 9223372036854775807 + 536870912 cannot be represented in type 'long' Fixes: 31678/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-5614204619980800 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
462b8261aa
commit
92fde2585e
|
@ -5051,6 +5051,7 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
int64_t stream_size = avio_size(pb);
|
int64_t stream_size = avio_size(pb);
|
||||||
int64_t offset = av_sat_add64(avio_tell(pb), atom.size), pts, timestamp;
|
int64_t offset = av_sat_add64(avio_tell(pb), atom.size), pts, timestamp;
|
||||||
uint8_t version, is_complete;
|
uint8_t version, is_complete;
|
||||||
|
int64_t offadd;
|
||||||
unsigned i, j, track_id, item_count;
|
unsigned i, j, track_id, item_count;
|
||||||
AVStream *st = NULL;
|
AVStream *st = NULL;
|
||||||
AVStream *ref_st = NULL;
|
AVStream *ref_st = NULL;
|
||||||
|
@ -5088,11 +5089,15 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
|
|
||||||
if (version == 0) {
|
if (version == 0) {
|
||||||
pts = avio_rb32(pb);
|
pts = avio_rb32(pb);
|
||||||
offset += avio_rb32(pb);
|
offadd= avio_rb32(pb);
|
||||||
} else {
|
} else {
|
||||||
pts = avio_rb64(pb);
|
pts = avio_rb64(pb);
|
||||||
offset += avio_rb64(pb);
|
offadd= avio_rb64(pb);
|
||||||
}
|
}
|
||||||
|
if (av_sat_add64(offset, offadd) != offset + (uint64_t)offadd)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
||||||
|
offset += (uint64_t)offadd;
|
||||||
|
|
||||||
avio_rb16(pb); // reserved
|
avio_rb16(pb); // reserved
|
||||||
|
|
||||||
|
@ -5115,6 +5120,8 @@ static int mov_read_sidx(MOVContext *c, AVIOContext *pb, MOVAtom atom)
|
||||||
if (frag_stream_info)
|
if (frag_stream_info)
|
||||||
frag_stream_info->sidx_pts = timestamp;
|
frag_stream_info->sidx_pts = timestamp;
|
||||||
|
|
||||||
|
if (av_sat_add64(offset, size) != offset + size)
|
||||||
|
return AVERROR_INVALIDDATA;
|
||||||
offset += size;
|
offset += size;
|
||||||
pts += duration;
|
pts += duration;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue