diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-30 00:05:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-06 19:49:11 +0100 |
| commit | 240546a185931426d241662dbd109f02d64e4107 (patch) | |
| tree | 096a0bc4ce40c3946393c233efb113874a852abe | |
| parent | 07df40db6e9cc34127a13ad0553eb88314f82f7c (diff) | |
| download | ffmpeg-240546a185931426d241662dbd109f02d64e4107.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)
(cherry picked from commit 6e774cf67e6f30feb9b3dec11713d6b6dc0b521c)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dsicinav.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c index f8093fccf2..0d9fe0502e 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -215,6 +215,8 @@ static int cinvideo_decode_frame(AVCodecContext *avctx, /* handle palette */ 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; |