diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-31 16:14:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:53:29 +0200 |
| commit | 9ab85e03ca9b4ec8e918b46466a18301da96d471 (patch) | |
| tree | 3ed71b80fc68e2798acc68c97244b612b7111a05 | |
| parent | fec6a5d940f7b792cf86ddaa38bf16926f873882 (diff) | |
| download | ffmpeg-9ab85e03ca9b4ec8e918b46466a18301da96d471.tar.gz | |
avformat/id3v2: Check the return from avio_get_str()
Fixes: out of array access
Fixes: 29446/clusterfuzz-testcase-minimized-ffmpeg_dem_AAC_fuzzer-5096222622875648
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 25f240fcb398eb499ca4b70c026a8bb9f2a32731)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/id3v2.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 63df4c21c4..3aa88a59f0 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -610,7 +610,10 @@ static void read_apic(AVFormatContext *s, AVIOContext *pb, int taglen, /* mimetype */ if (isv34) { - taglen -= avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); + int ret = avio_get_str(pb, taglen, mimetype, sizeof(mimetype)); + if (ret < 0 || ret >= taglen) + goto fail; + taglen -= ret; } else { if (avio_read(pb, mimetype, 3) < 0) goto fail; |