diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-10-30 22:04:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-10-09 22:02:20 +0200 |
| commit | de6e245fcecfbd9748b2db689b2f5d962c517e63 (patch) | |
| tree | 9b3ee5fa1439a92a1e99c0154830ff9813d9849e | |
| parent | 67c197abaf26a61ba4e4ff03c02b6cd35588970a (diff) | |
| download | ffmpeg-de6e245fcecfbd9748b2db689b2f5d962c517e63.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>
(cherry picked from commit a8fe78decd700afec461f06df4ce0d36f3e9cc4b)
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 34a88a2df7..1aecb2ff94 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -1307,8 +1307,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); |