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:43 +0200
commit75f5fe165cedc63ea89514b3e9f6da67fd1038ec (patch)
treec138bd908a7bfbdc795ad9ee2504e6961a46054e
parent665f70209a95b573f1b2b35851d00298f04ffd0f (diff)
downloadffmpeg-75f5fe165cedc63ea89514b3e9f6da67fd1038ec.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 5bd3f1349b..ce0f1a9db8 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -134,7 +134,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;