diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-30 22:04:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-10 21:18:17 +0100 |
| commit | a8fe78decd700afec461f06df4ce0d36f3e9cc4b (patch) | |
| tree | c3be01d02f98bfa0191713d97167625974a88ffa | |
| parent | f514113cfa9fc44d80086bb2a2b783e8026dc3a9 (diff) | |
| download | ffmpeg-a8fe78decd700afec461f06df4ce0d36f3e9cc4b.tar.gz | |
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 <michael@niedermayer.cc>
| -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 0f1560a615..521b9d0e8c 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -1290,8 +1290,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); |