aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-03 19:33:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-03 19:47:33 +0200
commit693faadd30c569d772cae2c6702895745348c5bd (patch)
tree23109034f5cc2c040e978b456ecab5408584d8fe
parent9806028fbba5dc7a2af6dd5b0a08057180cccc79 (diff)
downloadffmpeg-693faadd30c569d772cae2c6702895745348c5bd.tar.gz
avcodec/cinepak: fix integer underflow
Fixes out of array access Fixes: asan_heap-oob_4da0ba_6_asan_heap-oob_4da0ba_241_cvid_crash.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e7e5114c506957f40aafd794e06de1a7e341e9d5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/cinepak.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 082d0b232a..d0d07bc9ef 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -135,7 +135,7 @@ static int cinepak_decode_vectors (CinepakContext *s, cvid_strip *strip,
const uint8_t *eod = (data + size);
uint32_t flag, mask;
uint8_t *cb0, *cb1, *cb2, *cb3;
- unsigned int x, y;
+ int x, y;
char *ip0, *ip1, *ip2, *ip3;
flag = 0;