diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-31 13:30:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-08 14:48:01 +0100 |
| commit | 9802599ad0bef067d50ffc00b5e6b928589a7dd6 (patch) | |
| tree | 8ef3f57db65f01f8fc2a67a05d4e87b8243c399a | |
| parent | 81271b3cce3dea9543feb13d41f6ab285d19b770 (diff) | |
| download | ffmpeg-9802599ad0bef067d50ffc00b5e6b928589a7dd6.tar.gz | |
avformat/mxfdec: cleanup on "essence prior to first PartitionPack"
Fixes: memleak
Fixes: 18473/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5738557074833408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mxfdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 397f820b3f..bcee234ad7 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3169,6 +3169,7 @@ static int mxf_read_header(AVFormatContext *s) if (!mxf_read_sync(s->pb, mxf_header_partition_pack_key, 14)) { av_log(s, AV_LOG_ERROR, "could not find header partition pack key\n"); + //goto fail should not be needed as no metadata sets will have been parsed yet return AVERROR_INVALIDDATA; } avio_seek(s->pb, -14, SEEK_CUR); @@ -3199,7 +3200,8 @@ static int mxf_read_header(AVFormatContext *s) if (!mxf->current_partition) { av_log(mxf->fc, AV_LOG_ERROR, "found essence prior to first PartitionPack\n"); - return AVERROR_INVALIDDATA; + ret = AVERROR_INVALIDDATA; + goto fail; } if (!mxf->current_partition->first_essence_klv.offset) |