virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/mxfdec: Reset structural_components_count when allocation fails

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-11-30 23:25:19 +01:00
parent e5d217f048
commit 8653419e9d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mxfdec.c
View File

@@ -742,8 +742,10 @@ static int mxf_read_sequence(void *arg, AVIOContext *pb, int tag, int size, UID
case 0x1001: case 0x1001:
sequence->structural_components_count = avio_rb32(pb); sequence->structural_components_count = avio_rb32(pb);
sequence->structural_components_refs = av_calloc(sequence->structural_components_count, sizeof(UID)); sequence->structural_components_refs = av_calloc(sequence->structural_components_count, sizeof(UID));
if (!sequence->structural_components_refs) if (!sequence->structural_components_refs) {
sequence->structural_components_count = 0;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */ avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */
avio_read(pb, (uint8_t *)sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID)); avio_read(pb, (uint8_t *)sequence->structural_components_refs, sequence->structural_components_count * sizeof(UID));
break; break;
@@ -761,8 +763,10 @@ static int mxf_read_essence_group(void *arg, AVIOContext *pb, int tag, int size,
case 0x0501: case 0x0501:
essence_group->structural_components_count = avio_rb32(pb); essence_group->structural_components_count = avio_rb32(pb);
essence_group->structural_components_refs = av_calloc(essence_group->structural_components_count, sizeof(UID)); essence_group->structural_components_refs = av_calloc(essence_group->structural_components_count, sizeof(UID));
if (!essence_group->structural_components_refs) if (!essence_group->structural_components_refs) {
essence_group->structural_components_count = 0;
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */ avio_skip(pb, 4); /* useless size of objects, always 16 according to specs */
avio_read(pb, (uint8_t *)essence_group->structural_components_refs, essence_group->structural_components_count * sizeof(UID)); avio_read(pb, (uint8_t *)essence_group->structural_components_refs, essence_group->structural_components_count * sizeof(UID));
break; break;