diff options
| author | Michael Niedermayer <[email protected]> | 2020-10-20 21:32:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-02-02 14:18:21 +0100 |
| commit | 949a565a2df1c675e66294ed4ec0460c2c9e8114 (patch) | |
| tree | 7e6155eea2b7e02e2baea143b2dfe1c6ed00307c | |
| parent | e5c9bae371e384abf6e3e7106dfa85f4d27ebc65 (diff) | |
avformat/rmdec: Make expected_len 64bit
Fixes: signed integer overflow: 1347551268 * 14 cannot be represented in type 'int'
Fixes: 26458/clusterfuzz-testcase-minimized-ffmpeg_dem_RM_fuzzer-5655364324032512
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 728330462cadb765307cc132377b6b5d177a225c)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/rmdec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index 9bb11149e2..e1c846b603 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -698,17 +698,19 @@ static int rm_sync(AVFormatContext *s, int64_t *timestamp, int *flags, int *stre state= (state<<8) + avio_r8(pb); if(state == MKBETAG('I', 'N', 'D', 'X')){ - int n_pkts, expected_len; + int n_pkts; + int64_t expected_len; len = avio_rb32(pb); avio_skip(pb, 2); n_pkts = avio_rb32(pb); - expected_len = 20 + n_pkts * 14; - if (len == 20) + expected_len = 20 + n_pkts * 14LL; + + if (len == 20 && expected_len <= INT_MAX) /* some files don't add index entries to chunk size... */ len = expected_len; else if (len != expected_len) av_log(s, AV_LOG_WARNING, - "Index size %d (%d pkts) is wrong, should be %d.\n", + "Index size %d (%d pkts) is wrong, should be %"PRId64".\n", len, n_pkts, expected_len); len -= 14; // we already read part of the index header if(len<0) |