summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-30 00:05:50 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-30 02:09:57 +0200
commit8e5f093c2cf13eab3d68d893bf8f30c56ba4e733 (patch)
treea0394c451666419e6f8a2acc032e6b286db04231
parent44e2f0c3cd2df68659e07ed3d5eab4974794eb33 (diff)
downloadffmpeg-streaming-8e5f093c2cf13eab3d68d893bf8f30c56ba4e733.zip
ffmpeg-streaming-8e5f093c2cf13eab3d68d893bf8f30c56ba4e733.tar.gz
Check for out of bounds reads in the Delphine Software International CIN decoder.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/dsicinav.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 27f4204..691b597 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -217,6 +217,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);
OpenPOWER on IntegriCloud