From 12eb2fd5394813a6119912b22f5dfc17b4a6b4a0 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 15 Nov 2012 00:42:49 +0100 Subject: dxa: dont try to use the previous frame if there is none. Fixes null pointer dereference. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/dxa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/dxa.c') diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c index 13b63df926..d43e1134e2 100644 --- a/libavcodec/dxa.c +++ b/libavcodec/dxa.c @@ -256,7 +256,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac c->pic.key_frame = !(compr & 1); c->pic.pict_type = (compr & 1) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; for(j = 0; j < avctx->height; j++){ - if(compr & 1){ + if((compr & 1) && tmpptr){ for(i = 0; i < avctx->width; i++) outptr[i] = srcptr[i] ^ tmpptr[i]; tmpptr += stride; -- cgit v1.2.3