summaryrefslogtreecommitdiff
path: root/libavcodec/vqavideo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-22 23:43:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-22 23:43:37 +0100
commit3583c8706df0abbfa3ecdd6730f4f3d72a01fe6d (patch)
treeb8e69a2a8e34390977475c9a887ea1fd18732ed0 /libavcodec/vqavideo.c
parent464cef4c14a6a550ee30810416d18686b5f3ffa0 (diff)
vqavideodev: Check image dimensions
Fixes out of heap array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vqavideo.c')
-rw-r--r--libavcodec/vqavideo.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 85725ccc87..5c864c2ab1 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -164,6 +164,11 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
if (!s->next_codebook_buffer)
goto fail;
+ if (s->width % s->vector_width || s->height % s->vector_height) {
+ av_log(avctx, AV_LOG_ERROR, "Picture dimensions are not a multiple of the vector size\n");
+ goto fail;
+ }
+
/* allocate decode buffer */
s->decode_buffer_size = (s->width / s->vector_width) *
(s->height / s->vector_height) * 2;