]> git.sesse.net Git - ffmpeg/commitdiff
avformat/utils: check for integer overflow in av_get_frame_filename2()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 15 Aug 2020 20:52:42 +0000 (22:52 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 20 Jan 2021 20:26:46 +0000 (21:26 +0100)
Fixes: signed integer overflow: 317316873 * 10 cannot be represented in type 'int'
Fixes: 24708/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5731180885049344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/utils.c

index d193f9e85f77d61ec7d98998f8785cea77fff0be..8ac6bc04b8ee3ad13597dd80c518f19fea1ae58b 100644 (file)
@@ -4700,8 +4700,11 @@ int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number
         if (c == '%') {
             do {
                 nd = 0;
-                while (av_isdigit(*p))
+                while (av_isdigit(*p)) {
+                    if (nd >= INT_MAX / 10 - 255)
+                        goto fail;
                     nd = nd * 10 + *p++ - '0';
+                }
                 c = *p++;
             } while (av_isdigit(c));