summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-10 02:11:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-10 02:12:30 +0100
commit4162ceea93684f3cd656dc21d30903e102a44e73 (patch)
treec0ac77484ad62b56de85c7a8cc3e8a8501dbc61b /libavformat/mxfdec.c
parent7f9697aa114c9c452272351de759a6291e782da9 (diff)
avformat/mxfdec: check avio_read(UID) result
Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fc9ba2fd98e_82_02785736.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxfdec.c')
-rw-r--r--libavformat/mxfdec.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 07740ebb4b..c27c1fca2e 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -487,7 +487,10 @@ static int mxf_read_partition_pack(void *arg, AVIOContext *pb, int tag, int size
partition->index_sid = avio_rb32(pb);
avio_skip(pb, 8);
partition->body_sid = avio_rb32(pb);
- avio_read(pb, op, sizeof(UID));
+ if (avio_read(pb, op, sizeof(UID)) != sizeof(UID)) {
+ av_log(mxf->fc, AV_LOG_ERROR, "Failed reading UID\n");
+ return AVERROR_INVALIDDATA;
+ }
nb_essence_containers = avio_rb32(pb);
/* some files don'thave FooterPartition set in every partition */