libopenjpegenc: add NULL check for img before accessing it n2.4.10
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Sun, 31 May 2015 22:51:30 +0000 (00:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Jun 2015 01:22:17 +0000 (03:22 +0200)
If opj_image_create fails to allocate an image it returns NULL, which
causes a segmentation fault at 'img->x0 = 0'.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 1577526b47439f33a999339efdec5d624b70e1da)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libopenjpegenc.c

index 66633f4..458cf7c 100644 (file)
@@ -164,6 +164,9 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
 
     img = opj_image_create(numcomps, cmptparm, color_space);
 
+    if (!img)
+        return NULL;
+
     // x0, y0 is the top left corner of the image
     // x1, y1 is the width, height of the reference grid
     img->x0 = 0;