diff options
author | Michael Niedermayer <[email protected]> | 2021-04-15 22:44:19 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2021-10-09 18:34:49 +0200 |
commit | 6715ea85c08e41eb5e29690b0d8eeeafd01645d8 (patch) | |
tree | e117ebf8c322405c3f75c40b54d211ba137ac367 | |
parent | cbe954f578a19afc11a440fbd379fa8f6fe57b1c (diff) |
avformat/rmdec: Use 64bit for intermediate for DEINT_ID_INT4
Fixes: runtime error: signed integer overflow: 65312 * 65535 cannot be represented in type 'int'
Fixes: 32832/clusterfuzz-testcase-minimized-ffmpeg_dem_RM_fuzzer-4817710040088576
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit e2c2872393f25253aa40861a9707934c4b83a3af)
Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r-- | libavformat/rmdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 9f5df91c86..0135f935af 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -272,9 +272,9 @@ static int rm_read_audio_stream_info(AVFormatContext *s, AVIOContext *pb, case DEINT_ID_INT4: if (ast->coded_framesize > ast->audio_framesize || sub_packet_h <= 1 || - ast->coded_framesize * sub_packet_h > (2 + (sub_packet_h & 1)) * ast->audio_framesize) + ast->coded_framesize * (uint64_t)sub_packet_h > (2 + (sub_packet_h & 1)) * ast->audio_framesize) return AVERROR_INVALIDDATA; - if (ast->coded_framesize * sub_packet_h != 2*ast->audio_framesize) { + if (ast->coded_framesize * (uint64_t)sub_packet_h != 2*ast->audio_framesize) { avpriv_request_sample(s, "mismatching interleaver parameters"); return AVERROR_INVALIDDATA; } |