[FFmpeg-cvslog] avformat/mov: Change the type of the r/g/b variables

Michael Niedermayer git at videolan.org
Thu Sep 3 22:20:09 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep  3 21:54:44 2015 +0200| [9ed53d5a8a9673e2178a4d6eb3a9fc12ebfbc323] | committer: Michael Niedermayer

avformat/mov: Change the type of the r/g/b variables

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 at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ed53d5a8a9673e2178a4d6eb3a9fc12ebfbc323
---

 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 764a7b1..92d90db 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -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;



More information about the ffmpeg-cvslog mailing list