[libav-stable] 4xm: reject frames not compatible with the declared version

Luca Barbato git at libav.org
Wed Jun 12 15:11:16 CEST 2013


Module: libav
Branch: master
Commit: 145023f57262d21474e35b4a6069cf95136339d4

Author:    Luca Barbato <lu_zero at gentoo.org>
Committer: Luca Barbato <lu_zero at gentoo.org>
Date:      Thu Jun  6 16:58:57 2013 +0200

4xm: reject frames not compatible with the declared version

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org

---

 libavcodec/4xm.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 1e70644..3d8906b 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -837,6 +837,9 @@ static int decode_frame(AVCodecContext *avctx, void *data,
                 av_log(f->avctx, AV_LOG_ERROR, "cframe id mismatch %d %d\n",
                        id, avctx->frame_number);
 
+            if (f->version <= 1)
+                return AVERROR_INVALIDDATA;
+
             cfrm->size = cfrm->id = 0;
             frame_4cc  = AV_RL32("pfrm");
         } else



More information about the libav-stable mailing list