roqvideodec: check dimensions validity
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 14:18:17 +0000 (15:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Feb 2013 03:24:30 +0000 (04:24 +0100)
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/roqvideodec.c

index c9daec7..8949b92 100644 (file)
@@ -158,6 +158,12 @@ static av_cold int roq_decode_init(AVCodecContext *avctx)
     RoqContext *s = avctx->priv_data;
 
     s->avctx = avctx;
+
+    if (avctx->width%16 || avctx->height%16) {
+         av_log(avctx, AV_LOG_ERROR, "dimensions not being a multiple of 16 are unsupported\n");
+         return AVERROR_PATCHWELCOME;
+    }
+
     s->width = avctx->width;
     s->height = avctx->height;
     s->last_frame    = &s->frames[0];