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-17 15:57:27 +0200
commit22dbd1eb31d6ece0f448565a25f0cdab2a919068 (patch)
treedb06ce349da7d814b40454e226db99985642aa54
parent92ec4eacf9649501dd8e06b97af87c428ca06556 (diff)
downloadffmpeg-22dbd1eb31d6ece0f448565a25f0cdab2a919068.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 053ad24539..cbabd4b239 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -492,7 +492,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;
}