rv10: Reject slices that does not have the same type as the first one
authorLaurent Aimar <fenrir@videolan.org>
Sat, 17 Sep 2011 22:03:08 +0000 (00:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Sep 2011 19:03:11 +0000 (21:03 +0200)
This prevents crashes with some corrupted bitstreams.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/rv10.c

index b8cdf4a..189b79f 100644 (file)
@@ -560,8 +560,10 @@ static int rv10_decode_packet(AVCodecContext *avctx,
             return -1;
         ff_er_frame_start(s);
     } else {
-        if (s->current_picture_ptr->f.pict_type != s->pict_type)
+        if (s->current_picture_ptr->pict_type != s->pict_type) {
+            av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
             return -1;
+        }
     }