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

avformat/mxfdec: only call mxf_free_metadataset when ctx_size is != 0, otherwise ctx == mxf

Browse Source
This commit is contained in:
Baptiste Coudurier 2018-07-06 12:06:26 -07:00
parent 1809f1cda9
commit b420fead53
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mxfdec.c
View File

@ -2631,7 +2631,8 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
if (ctx_size && tag == 0x3C0A) { if (ctx_size && tag == 0x3C0A) {
avio_read(pb, ctx->uid, 16); avio_read(pb, ctx->uid, 16);
} else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) { } else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) {
mxf_free_metadataset(&ctx, !!ctx_size); if (ctx_size)
mxf_free_metadataset(&ctx, 1);
return ret; return ret;
} }
@ -2640,7 +2641,7 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
if (avio_tell(pb) > klv_end) { if (avio_tell(pb) > klv_end) {
if (ctx_size) { if (ctx_size) {
ctx->type = type; ctx->type = type;
mxf_free_metadataset(&ctx, !!ctx_size); mxf_free_metadataset(&ctx, 1);
} }
av_log(mxf->fc, AV_LOG_ERROR, av_log(mxf->fc, AV_LOG_ERROR,