avcodec/hnm4video: check dimensions for validity
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 22:11:20 +0000 (23:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 22:52:08 +0000 (23:52 +0100)
Fixes out of array read
Fixes: asan_heap-oob_e76e18_1244_CASSE.HNM
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hnm4video.c

index 678d283..f394032 100644 (file)
@@ -453,7 +453,9 @@ static av_cold int hnm_decode_init(AVCodecContext *avctx)
     hnm->buffer2   = av_mallocz(avctx->width * avctx->height);
     hnm->processed = av_mallocz(avctx->width * avctx->height);
 
-    if (!hnm->buffer1 || !hnm->buffer2 || !hnm->processed) {
+    if (   !hnm->buffer1 || !hnm->buffer2 || !hnm->processed
+        || avctx->width * avctx->height == 0
+        || avctx->height % 2) {
         av_log(avctx, AV_LOG_ERROR, "av_mallocz() failed\n");
         av_freep(&hnm->buffer1);
         av_freep(&hnm->buffer2);