[FFmpeg-cvslog] xxan: Disallow odd width
Martin Storsjö
git at videolan.org
Mon Sep 30 01:41:29 CEST 2013
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Sep 29 01:04:05 2013 +0300| [aa0dd52434768da64f1f3d8ae92bcf980c1adffc] | committer: Martin Storsjö
xxan: Disallow odd width
Decoded data is always written in pairs within this decoder.
This fixes writes out of bounds.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa0dd52434768da64f1f3d8ae92bcf980c1adffc
---
libavcodec/xxan.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index 2bc9ff6..05ce7ff 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -50,6 +50,10 @@ static av_cold int xan_decode_init(AVCodecContext *avctx)
av_log(avctx, AV_LOG_ERROR, "Invalid frame height: %d.\n", avctx->height);
return AVERROR(EINVAL);
}
+ if (avctx->width & 1) {
+ av_log(avctx, AV_LOG_ERROR, "Invalid frame width: %d.\n", avctx->width);
+ return AVERROR(EINVAL);
+ }
s->buffer_size = avctx->width * avctx->height;
s->y_buffer = av_malloc(s->buffer_size);
More information about the ffmpeg-cvslog
mailing list