summaryrefslogtreecommitdiff
path: root/libavcodec/libopenjpegdec.c
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-05-30 16:18:48 +0200
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-05-30 20:58:55 +0200
commit3ef5702926c495232ffe685303ba8661bdff1149 (patch)
treedaf3e1d274e818c1bb9600c20f935f2b89d27de5 /libavcodec/libopenjpegdec.c
parent161d0ac7219d75d84d8b515cd60109863d309394 (diff)
libopenjpegdec: check existence of image component data
libopenjpeg can return images with components without data. This fixes segmentation faults. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
-rw-r--r--libavcodec/libopenjpegdec.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 1cd1b9b009..ab681f1246 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -358,6 +358,15 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
goto done;
}
+ for (i = 0; i < image->numcomps; i++) {
+ if (!image->comps[i].data) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Image component %d contains no data.\n", i);
+ ret = AVERROR_INVALIDDATA;
+ goto done;
+ }
+ }
+
desc = av_pix_fmt_desc_get(avctx->pix_fmt);
pixel_size = desc->comp[0].step_minus1 + 1;
ispacked = libopenjpeg_ispacked(avctx->pix_fmt);