[FFmpeg-cvslog] avformat/id3v2: Check taglen in read_uslt()
Michael Niedermayer
git at videolan.org
Tue Mar 28 00:14:35 EEST 2023
ffmpeg | branch: release/5.0 | Michael Niedermayer <michael at niedermayer.cc> | Fri Nov 18 19:04:47 2022 +0100| [f75911ee66f8c9b276312dc31b1f0e4281a458b4] | committer: Michael Niedermayer
avformat/id3v2: Check taglen in read_uslt()
Fixes: Timeout (read mostly the same data repeatly)
Fixes: 52457/clusterfuzz-testcase-minimized-ffmpeg_dem_ALP_fuzzer-6610706313379840
Fixes: 53098/clusterfuzz-testcase-minimized-ffmpeg_dem_SOL_fuzzer-6481382981632000
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit a798af91d7d1fc31cfc1ae09cc6ab3907304f44f)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f75911ee66f8c9b276312dc31b1f0e4281a458b4
---
libavformat/id3v2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c
index ff27c062e5..936992c6c4 100644
--- a/libavformat/id3v2.c
+++ b/libavformat/id3v2.c
@@ -376,10 +376,10 @@ static void read_uslt(AVFormatContext *s, AVIOContext *pb, int taglen,
lang[3] = '\0';
taglen -= 3;
- if (decode_str(s, pb, encoding, &descriptor, &taglen) < 0)
+ if (decode_str(s, pb, encoding, &descriptor, &taglen) < 0 || taglen < 0)
goto error;
- if (decode_str(s, pb, encoding, &text, &taglen) < 0)
+ if (decode_str(s, pb, encoding, &text, &taglen) < 0 || taglen < 0)
goto error;
// FFmpeg does not support hierarchical metadata, so concatenate the keys.
More information about the ffmpeg-cvslog
mailing list