diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-11-14 18:23:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-11-26 21:31:06 +0100 |
| commit | 57adb26d058490daf2c5d6ddd3cf0cf2d2212256 (patch) | |
| tree | 7a9e3264266b79f3c18170f3915c3ba543c66f42 | |
| parent | ff23cee200239a8368515c5d8ba94fc769c3fea2 (diff) | |
| download | ffmpeg-57adb26d058490daf2c5d6ddd3cf0cf2d2212256.tar.gz | |
avformat/avidec: Check read_odml_index() for failure
Fixes: Timeout
Fixes: 40950/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-6478873068437504
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/avidec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index b10c3efa61..86f857b1e3 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -240,6 +240,8 @@ static int read_odml_index(AVFormatContext *s, int64_t frame_num) } else { int64_t offset, pos; int duration; + int ret; + offset = avio_rl64(pb); avio_rl32(pb); /* size */ duration = avio_rl32(pb); @@ -257,7 +259,7 @@ static int read_odml_index(AVFormatContext *s, int64_t frame_num) if (avio_seek(pb, offset + 8, SEEK_SET) < 0) return -1; avi->odml_depth++; - read_odml_index(s, frame_num); + ret = read_odml_index(s, frame_num); avi->odml_depth--; frame_num += duration; @@ -265,7 +267,8 @@ static int read_odml_index(AVFormatContext *s, int64_t frame_num) av_log(s, AV_LOG_ERROR, "Failed to restore position after reading index\n"); return -1; } - + if (ret < 0) + return ret; } } avi->index_loaded = 2; |