[FFmpeg-cvslog] avformat/sbgdec: Use av_sat_add64() in str_to_time()

Michael Niedermayer git at videolan.org
Mon Feb 1 20:04:08 EET 2021


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jan 31 20:55:53 2021 +0100| [5441699f8392bc3442f32137d8128d98a3b7b812] | committer: Michael Niedermayer

avformat/sbgdec: Use av_sat_add64() in str_to_time()

Fixes: signed integer overflow: 7279992792120000000 + 4611686018427387904 cannot be represented in type 'long long'
Fixes: 29744/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-6434060249464832

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Nicolas George <george at nsup.org>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5441699f8392bc3442f32137d8128d98a3b7b812
---

 libavformat/sbgdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index 8672e2e976..64c84c1618 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -199,7 +199,7 @@ static int str_to_time(const char *str, int64_t *rtime)
             cur = end;
         ts = av_clipd(seconds * AV_TIME_BASE, INT64_MIN/2, INT64_MAX/2);
     }
-    *rtime = (hours * 3600LL + minutes * 60LL) * AV_TIME_BASE + ts;
+    *rtime = av_sat_add64((hours * 3600LL + minutes * 60LL) * AV_TIME_BASE, ts);
     return cur - str;
 }
 



More information about the ffmpeg-cvslog mailing list