aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author孙浩(晓黑) <tony.sh@alibaba-inc.com>2017-08-29 23:59:21 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-09-01 03:20:53 +0200
commitb2aa633d663d4ed962ed92fcf5657df50521a8d9 (patch)
treed90882c25ad02658476c076d329eb1393d8c32a7
parent74c067e95572dd4bfb069123f44d68b8a12e1991 (diff)
downloadffmpeg-b2aa633d663d4ed962ed92fcf5657df50521a8d9.tar.gz
avformat/mxfdec: Fix Sign error in mxf_read_primer_pack()
Fixes: 20170829B.mxf Co-Author: 张洪亮(望初)" <wangchu.zhl@alibaba-inc.com> Found-by: Xiaohei and Wangchu from Alibaba Security Team Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 9d00fb9d70ee8c0cc7002b89318c5be00f1bbdad) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/mxfdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index ae518f9a88..bb0513aaa2 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -491,7 +491,7 @@ static int mxf_read_primer_pack(void *arg, AVIOContext *pb, int tag, int size, U
avpriv_request_sample(pb, "Primer pack item length %d", item_len);
return AVERROR_PATCHWELCOME;
}
- if (item_num > 65536) {
+ if (item_num > 65536 || item_num < 0) {
av_log(mxf->fc, AV_LOG_ERROR, "item_num %d is too large\n", item_num);
return AVERROR_INVALIDDATA;
}