har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/flvdec: Check for nesting depth in amf_skip_tag()

Browse Source 
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>
This commit is contained in:
Michael Niedermayer 2021-01-23 22:00:40 +01:00
parent a280136c7a
commit 6a3f5c9d76
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/flvdec.c
View File

@ -802,10 +802,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);
@ -830,7 +833,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;
@ -874,7 +877,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;
}
}