Ticket #3232: segfault_fix.diff

h264.c

@@ -4659 +4659 @@
         s->picture_structure= PICT_FRAME;
     }else{
         if(get_bits1(&s->gb)) { //field_pic_flag
-            s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
+            //s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
             av_log(h->s.avctx, AV_LOG_ERROR, "PAFF interlacing is not implemented\n");
+            return -1;
         } else {
             s->picture_structure= PICT_FRAME;
             h->mb_aff_frame = h->sps.mb_aff;
@@ -4716 +4717 @@
     if(h->slice_type == P_TYPE || h->slice_type == SP_TYPE || h->slice_type == B_TYPE){
         if(h->slice_type == B_TYPE){
             h->direct_spatial_mv_pred= get_bits1(&s->gb);
-            if(h->sps.mb_aff && h->direct_spatial_mv_pred)
+            if(h->sps.mb_aff && h->direct_spatial_mv_pred){
                 av_log(h->s.avctx, AV_LOG_ERROR, "MBAFF + spatial direct mode is not implemented\n");
+                return -1;
+            }
         }
         num_ref_idx_active_override_flag= get_bits1(&s->gb);
 
@@ -8175 +8178 @@
 
             if(decode_slice_header(h) < 0){
                 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
-                break;
+                return -1;
             }
             s->current_picture_ptr->key_frame= (h->nal_unit_type == NAL_IDR_SLICE);
             if(h->redundant_pic_count==0 && s->hurry_up < 5
@@ -8193 +8196 @@
 
             if(decode_slice_header(h) < 0){
                 av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
+                return -1;
             }
             break;
         case NAL_DPB: