[FFmpeg-cvslog] 4xm: reject frames not compatible with the declared version

[Luca Barbato]

ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Thu Jun  6 16:58:57 2013 +0200| [ded74ab5d1ccfef375090a0e828fa123c589083c] | committer: Luca Barbato

4xm: reject frames not compatible with the declared version

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit 145023f57262d21474e35b4a6069cf95136339d4)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

 libavcodec/4xm.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 4973b41..dbf4917 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -835,6 +835,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