aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-30 00:05:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:54:21 +0200
commit6e774cf67e6f30feb9b3dec11713d6b6dc0b521c (patch)
treeba07400a401f6443e0434475cf5414efff672c1d
parent18cfe0238df259e4b541d28b465688bea4781b16 (diff)
downloadffmpeg-6e774cf67e6f30feb9b3dec11713d6b6dc0b521c.tar.gz
Check for out of bounds writes in the Delphine Software International CIN decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3035c4034b6af3ad47f921e3385196e1b9d44ddf)
-rw-r--r--libavcodec/dsicinav.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index c33b3edc4c..faca821c7d 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -220,6 +220,8 @@ static int cinvideo_decode_frame(AVCodecContext *avctx,
if (bitmap_frame_size < palette_colors_count * (3 + (palette_type != 0)))
return AVERROR_INVALIDDATA;
if (palette_type == 0) {
+ if (palette_colors_count > 256)
+ return AVERROR_INVALIDDATA;
for (i = 0; i < palette_colors_count; ++i) {
cin->palette[i] = bytestream_get_le24(&buf);
bitmap_frame_size -= 3;