From 02fb320adadacfc8446a1278582351078a024dee Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 26 Mar 2012 02:01:23 +0000 Subject: [PATCH] libopenjpegdec: always check image because decoding may still fail Fixes bunch of segfaults. Signed-off-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/libopenjpegdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c index 29724a2f9f..fced76d47d 100644 --- a/libavcodec/libopenjpegdec.c +++ b/libavcodec/libopenjpegdec.c @@ -295,6 +295,11 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, // Decode the codestream image = opj_decode_with_info(dec, stream, NULL); opj_cio_close(stream); + if(!image) { + av_log(avctx, AV_LOG_ERROR, "Error decoding codestream.\n"); + opj_destroy_decompress(dec); + return -1; + } pixel_size = av_pix_fmt_descriptors[avctx->pix_fmt].comp[0].step_minus1 + 1; ispacked = libopenjpeg_ispacked(avctx->pix_fmt); -- 2.11.0