[FFmpeg-cvslog] cinepak: Fix invalid read access on extra data

[Laurent Aimar]

ffmpeg | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Sep 11 19:17:43 2011 +0200| [d239d4b447885cb7c5eee9ce359f34ad6b64f373] | committer: Janne Grunau

cinepak: Fix invalid read access on extra data

Signed-off-by: Janne Grunau <janne-libav at jannau.net>

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

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

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index 1d41ba2..c5d47be 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) &&