eacmv: check for out of bound reads

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

eacmv: check for out of bound reads
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
46cb2f6a · Laurent Aimar · Janne Grunau · 8df8a87e · 46cb2f6a
Commit 46cb2f6a authored Sep 30, 2011 by Laurent Aimar Committed by Janne Grunau Oct 10, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

eacmv.c libavcodec/eacmv.c +3 -0

No files found.
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -153,6 +153,9 @@ static int cmv_decode_frame(AVCodecContext *avctx,
    CmvContext *s = avctx->priv_data;
    const uint8_t *buf_end = buf + buf_size;

+    if (buf_end - buf < EA_PREAMBLE_SIZE)
+        return AVERROR_INVALIDDATA;
+
    if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) {
        cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end);
        return buf_size;