diff options
| author | Steve Lhomme <robux4@ycbcr.xyz> | 2019-02-13 13:20:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-17 10:29:42 +0100 |
| commit | 9326117bf63b04a466d9e787224e56ba8cdbb215 (patch) | |
| tree | e78ad9140215fc5d8eab2fcad75ea64768ddc2c5 /libavformat/matroskadec.c | |
| parent | b687b549aa0fb115861b1343208de8c2630803bf (diff) | |
| download | ffmpeg-9326117bf63b04a466d9e787224e56ba8cdbb215.tar.gz | |
avformat/matroskadec: Check parents remaining length
This was found through the Hacker One program on VLC but is not a security issue in libavformat
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/matroskadec.c')
| -rw-r--r-- | libavformat/matroskadec.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d7881d9c1d..5aa8a105dc 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1197,6 +1197,18 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, length, max_lengths[syntax->type], syntax->type); return AVERROR_INVALIDDATA; } + if (matroska->num_levels > 0) { + MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1]; + AVIOContext *pb = matroska->ctx->pb; + int64_t pos = avio_tell(pb); + if (level->length != (uint64_t) -1 && + (pos + length) > (level->start + level->length)) { + av_log(matroska->ctx, AV_LOG_ERROR, + "Invalid length 0x%"PRIx64" > 0x%"PRIx64" in parent\n", + length, level->start + level->length); + return AVERROR_INVALIDDATA; + } + } } switch (syntax->type) { |