[FFmpeg-devel] [PATCH 4/6] Fixed invalid read access on extra data in cinepak decoder.

fenrir at elivagar.org fenrir at elivagar.org
Sun Sep 11 19:17:43 CEST 2011


From: Laurent Aimar <fenrir at videolan.org>

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

diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c
index d2e0c26..5a1ccd8 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) &&
-- 
1.7.2.5



More information about the ffmpeg-devel mailing list