aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-01-17 00:07:29 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2021-10-17 21:34:53 +0200
commitac3b43148311a604f7ed5123b397fe0863ce48be (patch)
treecb39624573093c00476734c4b0c9ed36fec25c1c
parente45d6654feb321c81669f3c2ef5e5fb75e594ca3 (diff)
downloadffmpeg-ac3b43148311a604f7ed5123b397fe0863ce48be.tar.gz
avformat/sbgdec: Reduce the amount of floating point in str_to_time()
Fixes: 1e+75 is outside the range of representable values of type 'long' Fixes: 26910/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-6626834808700928 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit ac6c8993f79eaefb76e1fdf0eef5373ab3a46a4e) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/sbgdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index f55fa1d9b6..5e75271219 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -181,6 +181,7 @@ static int str_to_time(const char *str, int64_t *rtime)
char *end;
int hours, minutes;
double seconds = 0;
+ int64_t ts = 0;
if (*cur < '0' || *cur > '9')
return 0;
@@ -196,8 +197,9 @@ static int str_to_time(const char *str, int64_t *rtime)
seconds = strtod(cur + 1, &end);
if (end > cur + 1)
cur = end;
+ ts = av_clipd(seconds * AV_TIME_BASE, INT64_MIN/2, INT64_MAX/2);
}
- *rtime = (hours * 3600LL + minutes * 60LL + seconds) * AV_TIME_BASE;
+ *rtime = (hours * 3600LL + minutes * 60LL) * AV_TIME_BASE + ts;
return cur - str;
}