diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-04-19 20:23:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-09 13:54:52 +0200 |
| commit | 588c22d057e9469c46af042408facd8b07e5a4aa (patch) | |
| tree | a6b789ebad1b6366775f3717c2dd30e10adc57a1 | |
| parent | 06342bca35e7963c03414ddd8e1670566eecfc0e (diff) | |
| download | ffmpeg-588c22d057e9469c46af042408facd8b07e5a4aa.tar.gz | |
avformat/id3v2: Check end for overflow in id3v2_parse()
Fixes: signed integer overflow: 9223372036840103978 + 67637280 cannot be represented in type 'long'
Fixes: 33341/clusterfuzz-testcase-minimized-ffmpeg_dem_DSF_fuzzer-6408154041679872
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 efdb56450418933965dc6e27f0b1625d25e44a8c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/id3v2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index 3aa88a59f0..b99ea60533 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -828,7 +828,7 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, int isv34, unsync; unsigned tlen; char tag[5]; - int64_t next, end = avio_tell(pb) + len; + int64_t next, end = avio_tell(pb); int taghdrlen; const char *reason = NULL; AVIOContext pb_local; @@ -840,6 +840,10 @@ static void id3v2_parse(AVIOContext *pb, AVDictionary **metadata, av_unused int uncompressed_buffer_size = 0; const char *comm_frame; + if (end > INT64_MAX - len - 10) + return; + end += len; + av_log(s, AV_LOG_DEBUG, "id3v2 ver:%d flags:%02X len:%d\n", version, flags, len); switch (version) { |