[FFmpeg-cvslog] xan: fix out of array read

[Michael Niedermayer]

ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Mon May 28 17:04:38 2012 +0200| [1285fe5530437132a9d68d336d08b21c0e4ad58c] | committer: Michael Niedermayer

xan: fix out of array read

Fixes ticket1360

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 01900fcc45e99ee4556e0a5d87ff57b2f150dad4)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 17b994b..5341e0e 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -511,6 +511,10 @@ static int xan_decode_frame(AVCodecContext *avctx,
             int i;
             tag  = bytestream_get_le32(&buf);
             size = bytestream_get_be32(&buf);
+            if(size < 0) {
+                av_log(avctx, AV_LOG_ERROR, "Invalid tag size %d\n", size);
+                return AVERROR_INVALIDDATA;
+            }
             size = FFMIN(size, buf_end - buf);
             switch (tag) {
             case PALT_TAG: