diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2021-01-23 22:00:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-09-11 21:23:48 +0200 |
| commit | abb8a37bf8f68dc021a6c8bb098cfe6275a15ae7 (patch) | |
| tree | dd03a1de480491e615c30d38043346b1e9f042e9 | |
| parent | d99234eec2ed3c6445f4673533c3fec9f9f81a07 (diff) | |
| download | ffmpeg-abb8a37bf8f68dc021a6c8bb098cfe6275a15ae7.tar.gz | |
avformat/flvdec: Check for nesting depth in amf_skip_tag()
Fixes: out of array access
Fixes: 29440/clusterfuzz-testcase-minimized-ffmpeg_dem_KUX_fuzzer-5985279812960256.fuzz
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 2ef522c918d48b9f101548b2cadce02003cb3510)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/flvdec.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 75bdb9526e..506b24143f 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -794,10 +794,13 @@ static void clear_index_entries(AVFormatContext *s, int64_t pos) } } -static int amf_skip_tag(AVIOContext *pb, AMFDataType type) +static int amf_skip_tag(AVIOContext *pb, AMFDataType type, int depth) { int nb = -1, ret, parse_name = 1; + if (depth > MAX_DEPTH) + return AVERROR_PATCHWELCOME; + switch (type) { case AMF_DATA_TYPE_NUMBER: avio_skip(pb, 8); @@ -822,7 +825,7 @@ static int amf_skip_tag(AVIOContext *pb, AMFDataType type) } avio_skip(pb, size); } - if ((ret = amf_skip_tag(pb, avio_r8(pb))) < 0) + if ((ret = amf_skip_tag(pb, avio_r8(pb), depth + 1)) < 0) return ret; } break; @@ -866,7 +869,7 @@ static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, else break; } else { - if ((ret = amf_skip_tag(pb, type)) < 0) + if ((ret = amf_skip_tag(pb, type, 0)) < 0) goto skip; } } |