1. ffmpeg
  2. Commit 6ceef07b21a6b828d98f25edefb66e322a628667
Browse code

mss2: do not try to read too many palette entries

Reported by Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

Alberto Delmás authored on 2012/09/04 00:28:01
Showing 1 changed files
libavcodec/mss2.c
History View file @ 6ceef07
... ... 
@@ -161,7 +161,7 @@ static int decode_pal_v2(MSS12Context *ctx, const uint8_t *buf, int buf_size)
161 161 
         return 0;
162 162
163 163 
     ncol = *buf++;
164 
-    if (buf_size < 2 + ncol * 3)
164 
+    if (ncol > ctx->free_colours || buf_size < 2 + ncol * 3)
165 165 
         return -1;
166 166 
     for (i = 0; i < ncol; i++)
167 167 
         *pal++ = AV_RB24(buf + 3 * i);