avcodec/ljpegenc: Check for av_malloc_array() failure
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 20:25:26 +0000 (21:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Jan 2015 20:25:26 +0000 (21:25 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ljpegenc.c

index 19ae151..1ace31b 100644 (file)
@@ -293,6 +293,8 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx)
     avctx->coded_frame->key_frame = 1;
 
     s->scratch = av_malloc_array(avctx->width + 1, sizeof(*s->scratch));
+    if (!s->scratch)
+        goto fail;
 
     ff_idctdsp_init(&s->idsp, avctx);
     ff_init_scantable(s->idsp.idct_permutation, &s->scantable,
@@ -310,6 +312,9 @@ static av_cold int ljpeg_encode_init(AVCodecContext *avctx)
                                  avpriv_mjpeg_val_dc);
 
     return 0;
+fail:
+    ljpeg_encode_close(avctx);
+    return AVERROR(ENOMEM);
 }
 
 AVCodec ff_ljpeg_encoder = {