diff mbox series

[FFmpeg-devel,4/7] avformat/sbgdec: Check for timestamp overflow in parse_time_sequence()

Message ID 20201019142501.6867-4-michael@niedermayer.cc
State Accepted
Commit 685ed1cbd139d1da04d432a3d3be9929666761bf
Headers show
Series [FFmpeg-devel,1/7] avcodec/fits: Check bscale | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Michael Niedermayer Oct. 19, 2020, 2:24 p.m. UTC 
Fixes: signed integer overflow: 3458015007900000256 + 6425686373040000000 cannot be represented in type 'long'
Fixes: 26430/clusterfuzz-testcase-minimized-ffmpeg_dem_BRSTM_fuzzer-5761175004119040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/sbgdec.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Nicolas George Oct. 19, 2020, 2:32 p.m. UTC | #1 
Michael Niedermayer (12020-10-19):
> Fixes: signed integer overflow: 3458015007900000256 + 6425686373040000000 cannot be represented in type 'long'
> Fixes: 26430/clusterfuzz-testcase-minimized-ffmpeg_dem_BRSTM_fuzzer-5761175004119040
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/sbgdec.c | 3 +++
>  1 file changed, 3 insertions(+)

No objection.

Regards,
Michael Niedermayer Oct. 20, 2020, 8:20 a.m. UTC | #2 
On Mon, Oct 19, 2020 at 04:32:56PM +0200, Nicolas George wrote:
> Michael Niedermayer (12020-10-19):
> > Fixes: signed integer overflow: 3458015007900000256 + 6425686373040000000 cannot be represented in type 'long'
> > Fixes: 26430/clusterfuzz-testcase-minimized-ffmpeg_dem_BRSTM_fuzzer-5761175004119040
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavformat/sbgdec.c | 3 +++
> >  1 file changed, 3 insertions(+)
> 
> No objection.

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index c11244ef3d..4d6ae7abc5 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -538,6 +538,9 @@  static int parse_time_sequence(struct sbg_parser *p, int inblock)
         return AVERROR_INVALIDDATA;
     }
     ts.type = p->current_time.type;
+
+    if (av_sat_add64(p->current_time.t, rel_ts) != p->current_time.t + (uint64_t)rel_ts)
+        return AVERROR_INVALIDDATA;
     ts.t    = p->current_time.t + rel_ts;
     r = parse_fade(p, &fade);
     if (r < 0)