ffmpeg | branch: master | Michael Niedermayer <michaelni@gmx.at> | Sun Nov 30 23:25:19 2014 +0100| [8653419e9d16c9b1e4ecd4221543d919965258a1] | committer: Michael Niedermayer avformat/mxfdec: Reset structural_components_count when allocation fails Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8653419e9d16c9b1e4...

libavformat/mxfdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 8aaf4c3..0c88a8a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -742,8 +742,10 @@ static int mxf_read_sequence(void *arg, AVIOContext *pb, int tag, int size, UID case 0x1001: sequence->structural_components_count = avio_rb32(pb); 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); + } 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)); break; @@ -761,8 +763,10 @@ static int mxf_read_essence_group(void *arg, AVIOContext *pb, int tag, int size, case 0x0501: essence_group->structural_components_count = avio_rb32(pb); 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); + } 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)); break;