aboutsummaryrefslogtreecommitdiff
path: root/libavcodec/cinepak.c
diff options
context:
space:
mode:
authorLaurent Aimar2011-09-11 19:17:43 +0200
committerJanne Grunau2011-10-06 23:35:29 +0200
commitd239d4b447885cb7c5eee9ce359f34ad6b64f373 (patch)
tree208b32b1e6375bd11101aa983021749e4fca7859 /libavcodec/cinepak.c
parentc0cbe36b18ab3eb13a53fe684ec1f63a00df2c86 (diff)
cinepak: Fix invalid read access on extra data
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/cinepak.c')
-rw-r--r--libavcodec/cinepak.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 1d41ba2287..c5d47be2ac 100644
--- a/libavcodec/cinepak.c
+++ b/libavcodec/cinepak.c
@@ -336,7 +336,8 @@ static int cinepak_decode (CinepakContext *s)
* If the frame header is followed by the bytes FE 00 00 06 00 00 then
* this is probably one of the two known files that have 6 extra bytes
* after the frame header. Else, assume 2 extra bytes. */
- if ((s->data[10] == 0xFE) &&
+ if (s->size >= 16 &&
+ (s->data[10] == 0xFE) &&
(s->data[11] == 0x00) &&
(s->data[12] == 0x00) &&
(s->data[13] == 0x06) &&