[FFmpeg-devel] [PATCH] libopenjpegdec: always check image because decoding may still fail
Paul B Mahol
onemda at gmail.com
Mon Mar 26 04:01:23 CEST 2012
Fixes bunch of segfaults.
Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
libavcodec/libopenjpegdec.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 5c33bd7..5ec8c94 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -293,6 +293,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);
--
1.7.7
More information about the ffmpeg-devel
mailing list