]> git.sesse.net Git - ffmpeg/commitdiff
avutil/parseutils: Check sign in av_parse_time()
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 14 Jan 2021 20:11:05 +0000 (21:11 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 3 Mar 2021 15:54:20 +0000 (16:54 +0100)
Fixes: signed integer overflow: -9223372053736 * 1000000 cannot be represented in type 'long'
Fixes: 26910/clusterfuzz-testcase-minimized-ffmpeg_dem_CONCAT_fuzzer-6607924558430208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavutil/parseutils.c

index 167e8226482f72481e7ac8fbcebd9f8b4fb20a70..7f678cd85af190535c2912910aeb06650a64161e 100644 (file)
@@ -736,12 +736,14 @@ int av_parse_time(int64_t *timeval, const char *timestr, int duration)
     if (*q)
         return AVERROR(EINVAL);
 
-    if (INT64_MAX / suffix < t)
+    if (INT64_MAX / suffix < t || t < INT64_MIN / suffix)
         return AVERROR(ERANGE);
     t *= suffix;
     if (INT64_MAX - microseconds < t)
         return AVERROR(ERANGE);
     t += microseconds;
+    if (t == INT64_MIN && negative)
+        return AVERROR(ERANGE);
     *timeval = negative ? -t : t;
     return 0;
 }