avcodec/cinepak: fix integer underflow
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 17:33:01 +0000 (19:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 17:47:33 +0000 (19:47 +0200)
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>
libavcodec/cinepak.c

index 082d0b2..d0d07bc 100644 (file)
@@ -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;