Browse Source

avcodec/hnm4video: check dimensions for validity

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>
tags/n2.2-rc1
Michael Niedermayer 12 years ago
parent
commit
bd8d28e2d2
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      libavcodec/hnm4video.c

+ 3
- 1
libavcodec/hnm4video.c View 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);


Loading…
Cancel
Save