dxa: dont try to use the previous frame if there is none.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 23:42:49 +0000 (00:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Nov 2012 23:43:30 +0000 (00:43 +0100)
Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxa.c

index 13b63df..d43e113 100644 (file)
@@ -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;