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

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| [914b9b0b2b162a70a5fd4d61dc79f98e607af6a9] | committer: Reinhard Tartler

dsicinav: Check for out of bounds reads

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

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

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

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

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



More information about the ffmpeg-cvslog mailing list