summaryrefslogtreecommitdiff
path: root/libavcodec/xan.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-28 17:04:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-28 17:24:13 +0200
commit01900fcc45e99ee4556e0a5d87ff57b2f150dad4 (patch)
tree5573d56290e030dc1ae1038cad61c6807fd31511 /libavcodec/xan.c
parent1e5c7376c4ed733910845c9a09e272ac7696b1f4 (diff)
xan: fix out of array read
Fixes ticket1360 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xan.c')
-rw-r--r--libavcodec/xan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 155dee9595..b39290aedf 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -517,6 +517,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: