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

mxfenc: Fix possible integer overflows

Browse Source 
None of these are likely unless the user is writing a file with two billion
streams or a duration of around two months.

CC: libav-stable@libav.org
Bug-Id: CID 700568 / CID 700569 / CID 700570 /
        CID 700571 / CID 700572 / CID 700573
This commit is contained in:
Tomas Härdin
2014-10-24 00:05:59 +01:00
committed by Vittorio Giovara
parent ad6b00d85f
commit 7df3b426bb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mxfenc.c
View File

@@ -447,7 +447,7 @@ static void mxf_write_preface(AVFormatContext *s)
mxf_write_metadata_key(pb, 0x012f00); mxf_write_metadata_key(pb, 0x012f00);
PRINT_KEY(s, "preface key", pb->buf_ptr - 16); PRINT_KEY(s, "preface key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 130 + 16 * mxf->essence_container_count); klv_encode_ber_length(pb, 130 + 16LL * mxf->essence_container_count);
// write preface set uid // write preface set uid
mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_local_tag(pb, 16, 0x3C0A);
@@ -720,7 +720,7 @@ static void mxf_write_multi_descriptor(AVFormatContext *s)
mxf_write_metadata_key(pb, 0x014400); mxf_write_metadata_key(pb, 0x014400);
PRINT_KEY(s, "multiple descriptor key", pb->buf_ptr - 16); PRINT_KEY(s, "multiple descriptor key", pb->buf_ptr - 16);
klv_encode_ber_length(pb, 64 + 16 * s->nb_streams); klv_encode_ber_length(pb, 64 + 16LL * s->nb_streams);
mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_local_tag(pb, 16, 0x3C0A);
mxf_write_uuid(pb, MultipleDescriptor, 0); mxf_write_uuid(pb, MultipleDescriptor, 0);
@@ -1053,8 +1053,8 @@ static void mxf_write_index_table_segment(AVFormatContext *s)
if (mxf->edit_unit_byte_count) { if (mxf->edit_unit_byte_count) {
klv_encode_ber_length(pb, 80); klv_encode_ber_length(pb, 80);
} else { } else {
klv_encode_ber_length(pb, 85 + 12+(s->nb_streams+1)*6 + klv_encode_ber_length(pb, 85 + 12+(s->nb_streams+1LL)*6 +
12+mxf->edit_units_count*(11+mxf->slice_count*4)); 12+mxf->edit_units_count*(11+mxf->slice_count*4LL));
} }
// instance id // instance id
@@ -1216,7 +1216,7 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid,
// write klv // write klv
avio_write(pb, key, 16); avio_write(pb, key, 16);
klv_encode_ber_length(pb, 88 + 16 * mxf->essence_container_count); klv_encode_ber_length(pb, 88 + 16LL * mxf->essence_container_count);
// write partition value // write partition value
avio_wb16(pb, 1); // majorVersion avio_wb16(pb, 1); // majorVersion
@@ -1761,7 +1761,7 @@ static void mxf_write_random_index_pack(AVFormatContext *s)
int i; int i;
avio_write(pb, random_index_pack_key, 16); avio_write(pb, random_index_pack_key, 16);
klv_encode_ber_length(pb, 28 + 12*mxf->body_partitions_count); klv_encode_ber_length(pb, 28 + 12LL*mxf->body_partitions_count);
if (mxf->edit_unit_byte_count) if (mxf->edit_unit_byte_count)
avio_wb32(pb, 1); // BodySID of header partition avio_wb32(pb, 1); // BodySID of header partition