[FFmpeg-cvslog] dsicinav: Check for out of bounds writes

Laurent Aimar git at videolan.org
Mon Mar 19 05:30:28 CET 2012


ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Thu Sep 29 23:13:35 2011 +0000| [aa9e308580dc929d920c93b130e10153414a9ffb] | committer: Reinhard Tartler

dsicinav: Check for out of bounds writes

Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 172060328771d149b076f00352b004b5b5272d38)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa9e308580dc929d920c93b130e10153414a9ffb
---

 libavcodec/dsicinav.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index d8c99b5..11547c2 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;



More information about the ffmpeg-cvslog mailing list