Commit 9326117b authored by Steve Lhomme's avatar Steve Lhomme Committed by Michael Niedermayer

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: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent b687b549
...@@ -1197,6 +1197,18 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska, ...@@ -1197,6 +1197,18 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
length, max_lengths[syntax->type], syntax->type); length, max_lengths[syntax->type], syntax->type);
return AVERROR_INVALIDDATA; 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) { switch (syntax->type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment