virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/matroskadec: validate MaxBlockAdditionID in the presence of BlockAdditions

Browse Source 
The Matroska spec requires it to be equal to the highest BlockAddID value in a
BlockAdditions, but being purely an informative element, only abort if strict
compliance is requested, as demuxing is otherwise unaffected.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2023-04-07 13:59:33 -03:00
parent 2133cadfcf
commit 6d31619af2
1 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavformat/matroskadec.c
View File

@@ -3659,6 +3659,16 @@ static int matroska_parse_block_additional(MatroskaDemuxContext *matroska,
uint8_t *side_data; uint8_t *side_data;
int res; int res;
if (!matroska->is_webm && track->max_block_additional_id && id > track->max_block_additional_id) {
int strict = matroska->ctx->strict_std_compliance >= FF_COMPLIANCE_STRICT;
av_log(matroska->ctx, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
"BlockAddID %"PRIu64" is higher than the reported MaxBlockAdditionID %"PRIu64" "
"for Track with TrackNumber %"PRIu64"\n", id, track->max_block_additional_id,
track->num);
if (strict)
return AVERROR_INVALIDDATA;
}
for (int i = 0; i < mappings_list->nb_elem; i++) { for (int i = 0; i < mappings_list->nb_elem; i++) {
if (id != mappings[i].value) if (id != mappings[i].value)
continue; continue;
@@ -3767,6 +3777,17 @@ static int matroska_parse_frame(MatroskaDemuxContext *matroska,
if (!pkt_size && !nb_blockmore) if (!pkt_size && !nb_blockmore)
goto no_output; goto no_output;
if (!matroska->is_webm && nb_blockmore && !track->max_block_additional_id) {
int strict = matroska->ctx->strict_std_compliance >= FF_COMPLIANCE_STRICT;
av_log(matroska->ctx, strict ? AV_LOG_ERROR : AV_LOG_WARNING,
"Unexpected BlockAdditions found in a Block from Track with TrackNumber %"PRIu64" "
"where MaxBlockAdditionID is 0\n", track->num);
if (strict) {
res = AVERROR_INVALIDDATA;
goto fail;
}
}
if (!buf) if (!buf)
pkt->buf = av_buffer_create(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE, pkt->buf = av_buffer_create(pkt_data, pkt_size + AV_INPUT_BUFFER_PADDING_SIZE,
NULL, NULL, 0); NULL, NULL, 0);