| Message ID | 20210826195015.3327-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | 4de4bc06fdfd0383f3d9012c6557a38408a09d28 |
| Headers | show |
| Series | [FFmpeg-devel] avformat/mov: Check dts for overflow in mov_read_trun() | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Thu, Aug 26, 2021 at 09:50:15PM +0200, Michael Niedermayer wrote: > Fixes: signed integer overflow: 9223372034248226491 + 3275247799 cannot be represented in type 'long' > Fixes: clusterfuzz-testcase-minimized-audio_decoder_fuzzer-4538729166077952 > > Reported-by: Matt Wolenetz <wolenetz@google.com> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> > --- > libavformat/mov.c | 2 ++ > 1 file changed, 2 insertions(+) will apply [...]
diff --git a/libavformat/mov.c b/libavformat/mov.c index da4c5d60f8..c5583e07c7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4953,6 +4953,8 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) "size %u, distance %d, keyframe %d\n", st->index, index_entry_pos, offset, dts, sample_size, distance, keyframe); distance++; + if (av_sat_add64(dts, sample_duration) != dts + (uint64_t)sample_duration) + return AVERROR_INVALIDDATA; dts += sample_duration; offset += sample_size; sc->data_size += sample_size;
Fixes: signed integer overflow: 9223372034248226491 + 3275247799 cannot be represented in type 'long' Fixes: clusterfuzz-testcase-minimized-audio_decoder_fuzzer-4538729166077952 Reported-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+)