diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-29 23:13:35 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:31 +0100 |
| commit | 914b9b0b2b162a70a5fd4d61dc79f98e607af6a9 (patch) | |
| tree | d6672bd28a956f623526fecfb229bace1b24b643 | |
| parent | 39de0e008d473662fd8381da4cbd5887e4fd5cc2 (diff) | |
| download | ffmpeg-914b9b0b2b162a70a5fd4d61dc79f98e607af6a9.tar.gz | |
dsicinav: Check for out of bounds reads
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit e3ca9b93d9f464861638dda3280fcf65e402466a)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -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 643aed946b..d8c99b508e 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -216,6 +216,8 @@ static int cinvideo_decode_frame(AVCodecContext *avctx, bitmap_frame_size = buf_size - 4; /* handle palette */ + if (bitmap_frame_size < palette_colors_count * (3 + (palette_type != 0))) + return AVERROR_INVALIDDATA; if (palette_type == 0) { for (i = 0; i < palette_colors_count; ++i) { cin->palette[i] = bytestream_get_le24(&buf); |