diff options
| author | Michael Niedermayer <[email protected]> | 2020-10-30 22:04:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2021-09-11 21:23:49 +0200 |
| commit | 73c963692e78a7f15bfa09f19cf2f86860fb36fc (patch) | |
| tree | 48f1c2e4b3c18b88c2009b8502f26c3a73d9c622 | |
| parent | bbdd7670535d66f65c2ad22c72316b1f59053881 (diff) | |
avformat/rmdec: Check remaining space in debug av_log() loop
Fixes: Timeout (long -> 2 ms)
Fixes: 26709/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-5665833403285504
Fixes: 27522/clusterfuzz-testcase-minimized-ffmpeg_dem_IVR_fuzzer-6321071221112832
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 a8fe78decd700afec461f06df4ce0d36f3e9cc4b)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavformat/rmdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index c01c822152..23b8b86354 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -1292,8 +1292,11 @@ static int ivr_read_header(AVFormatContext *s) int j; av_log(s, AV_LOG_DEBUG, "%s = '0x", key); - for (j = 0; j < len; j++) + for (j = 0; j < len; j++) { + if (avio_feof(pb)) + return AVERROR_INVALIDDATA; av_log(s, AV_LOG_DEBUG, "%X", avio_r8(pb)); + } av_log(s, AV_LOG_DEBUG, "'\n"); } else if (len == 4 && type == 3 && !strncmp(key, "Duration", tlen)) { st->duration = avio_rb32(pb); |