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 | aa9e308580dc929d920c93b130e10153414a9ffb (patch) | |
| tree | 73af4e640324dcb4a7c24bf659c95e7ebc6aeec1 | |
| parent | d57d039e04b9955beb603d1a85971bdd6dec5d02 (diff) | |
| download | ffmpeg-aa9e308580dc929d920c93b130e10153414a9ffb.tar.gz | |
dsicinav: Check for out of bounds writes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 172060328771d149b076f00352b004b5b5272d38)
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 d8c99b508e..11547c2ded 100644 --- a/libavcodec/dsicinav.c +++ b/libavcodec/dsicinav.c @@ -219,6 +219,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; |