projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
210c803
)
dsicinav: Check for out of bounds reads
author
Laurent Aimar
<fenrir@videolan.org>
Thu, 29 Sep 2011 23:13:35 +0000
(23:13 +0000)
committer
Janne Grunau
<janne-libav@jannau.net>
Fri, 7 Oct 2011 14:25:31 +0000
(16:25 +0200)
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
libavcodec/dsicinav.c
patch
|
blob
|
history
diff --git
a/libavcodec/dsicinav.c
b/libavcodec/dsicinav.c
index
0e0d73b
..
5fe99ba
100644
(file)
--- 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);