]> git.sesse.net Git - ffmpeg/commitdiff
avformat/rmdec: Fix codecdata_length overflow check
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 18 Dec 2020 22:13:58 +0000 (23:13 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 2 Feb 2021 12:12:12 +0000 (13:12 +0100)
Fixes: signed integer overflow: 2147483647 + 64 cannot be represented in type 'int'
Fixes: 28509/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-6310969680723968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/rmdec.c

index 004c62086d961d6205e09613dfa46221c37babf7..ae83a8afe7b3f0e115604b233102972909f6bd9f 100644 (file)
@@ -254,7 +254,7 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb,
             if (version == 5)
                 avio_r8(pb);
             codecdata_length = avio_rb32(pb);
-            if(codecdata_length + AV_INPUT_BUFFER_PADDING_SIZE <= (unsigned)codecdata_length){
+            if((unsigned)codecdata_length > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE){
                 av_log(s, AV_LOG_ERROR, "codecdata_length too large\n");
                 return -1;
             }