avcodec/mpegvideo_motion: Check P field references
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Apr 2013 17:53:00 +0000 (19:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 18 Apr 2013 18:13:22 +0000 (20:13 +0200)
If a reference is unavailable use a field from the current
picture
Fixes null pointer dereference

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

index be1b48d..225e9a6 100644 (file)
@@ -809,7 +809,8 @@ static av_always_inline void MPV_motion_internal(MpegEncContext *s,
                                   s->mv[dir][1][0], s->mv[dir][1][1], 8, mb_y);
             }
         } else {
-            if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != AV_PICTURE_TYPE_B && !s->first_field){
+            if(   s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != AV_PICTURE_TYPE_B && !s->first_field
+               || !ref_picture[0]){
                 ref_picture = s->current_picture_ptr->f.data;
             }