From 6ceef07b21a6b828d98f25edefb66e322a628667 Mon Sep 17 00:00:00 2001
From: Alberto Delmás <adelmas@gmail.com>
Date: Mon, 3 Sep 2012 17:28:01 +0200
Subject: 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>
---
 libavcodec/mss2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavcodec/mss2.c')

diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c
index ce3cfb8a7a..9914562da6 100644
--- a/libavcodec/mss2.c
+++ b/libavcodec/mss2.c
@@ -161,7 +161,7 @@ static int decode_pal_v2(MSS12Context *ctx, const uint8_t *buf, int buf_size)
         return 0;
 
     ncol = *buf++;
-    if (buf_size < 2 + ncol * 3)
+    if (ncol > ctx->free_colours || buf_size < 2 + ncol * 3)
         return -1;
     for (i = 0; i < ncol; i++)
         *pal++ = AV_RB24(buf + 3 * i);
-- 
cgit v1.2.3