From 6c07e41f43026eb65b6a4afc3119d6666781c211 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 13 Sep 2013 23:22:44 +0200 Subject: [PATCH] avcodec/mjpegdec: check for malloc failure of blocks[] and last_nnz[] Fixes null pointer dereference Fixes Ticket2947 Signed-off-by: Michael Niedermayer --- libavcodec/mjpegdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index cca69023f9..d08818f2e2 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -507,6 +507,8 @@ unk_pixfmt: av_freep(&s->last_nnz[i]); s->blocks[i] = av_malloc(size * sizeof(**s->blocks)); s->last_nnz[i] = av_mallocz(size * sizeof(**s->last_nnz)); + if (!s->blocks[i] || !s->last_nnz[i]) + return AVERROR(ENOMEM); s->block_stride[i] = bw * s->h_count[i]; } memset(s->coefs_finished, 0, sizeof(s->coefs_finished));