]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mov: Change the type of the r/g/b variables
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 3 Sep 2015 19:54:44 +0000 (21:54 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 3 Sep 2015 20:17:00 +0000 (22:17 +0200)
Fixes integer overflow
Fixes: unknown_unknown_31b_795_cov_1818643045_raybauduc.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c

index 764a7b141113a99b6235db40c47ba186e28cc60e..92d90dbb30803b04af186ae45e23ec78f0e925f0 100644 (file)
@@ -1710,7 +1710,7 @@ static void mov_parse_stsd_video(MOVContext *c, AVIOContext *pb,
     if ((color_depth == 2) || (color_depth == 4) || (color_depth == 8)) {
         /* for palette traversal */
         unsigned int color_start, color_count, color_end;
-        unsigned char a, r, g, b;
+        unsigned int a, r, g, b;
 
         if (color_greyscale) {
             int color_index, color_dec;