Browse Source

avcodec/rawdec: Check the return code of avpicture_get_size()

Fixes out of array access
Fixes: asan_heap-oob_22388d0_3435_cov_3297128910_small_roll5_FlashCine1.cine
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1d3a3b9f89)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.4
Michael Niedermayer 11 years ago
parent
commit
12e064d6c2
1 changed files with 3 additions and 0 deletions
  1. +3
    -0
      libavcodec/rawdec.c

+ 3
- 0
libavcodec/rawdec.c View File

@@ -172,6 +172,9 @@ static int raw_decode(AVCodecContext *avctx, void *data, int *got_frame,
context->frame_size = avpicture_get_size(avctx->pix_fmt, avctx->width,
avctx->height);
}
if (context->frame_size < 0)
return context->frame_size;

need_copy = !avpkt->buf || context->is_2_4_bpp || context->is_yuv2 || context->is_lt_16bpp;

frame->pict_type = AV_PICTURE_TYPE_I;


Loading…
Cancel
Save