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

avformat/mxfdec: fix and enhance RIP KLV length checks

Browse Source 
KLV length is BER encoded (variable size), but the code assumed the encoding to
always use 4 bytes.

Fixes parsing Random Index Pack in samples/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2019-04-04 23:08:42 +02:00
parent fc15e8306f
commit 3dee6c0997
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mxfdec.c
View File

@ -3138,9 +3138,12 @@ static void mxf_read_random_index_pack(AVFormatContext *s)
goto end;
avio_seek(s->pb, file_size - length, SEEK_SET);
if (klv_read_packet(&klv, s->pb) < 0 ||
!IS_KLV_KEY(klv.key, mxf_random_index_pack_key) ||
klv.length != length - 20)
!IS_KLV_KEY(klv.key, mxf_random_index_pack_key))
goto end;
if (klv.next_klv != file_size || klv.length <= 4 || (klv.length - 4) % 12) {
av_log(s, AV_LOG_WARNING, "Invalid RIP KLV length\n");
goto end;
}
avio_skip(s->pb, klv.length - 12);
mxf->footer_partition = avio_rb64(s->pb);