Module: libav Branch: master Commit: 4a29b471869353c3077fb4b25b6518eb1047afb7
Author: Laurent Aimar <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Sun Sep 18 00:03:08 2011 +0200 rv10: Reject slices that does not have the same type as the first one This prevents crashes with some corrupted bitstreams. Signed-off-by: Martin Storsjö <[email protected]> --- libavcodec/rv10.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c index d789eff..3ba8102 100644 --- a/libavcodec/rv10.c +++ b/libavcodec/rv10.c @@ -531,6 +531,11 @@ static int rv10_decode_packet(AVCodecContext *avctx, if(MPV_frame_start(s, avctx) < 0) return -1; ff_er_frame_start(s); + } else { + if (s->current_picture_ptr->f.pict_type != s->pict_type) { + av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n"); + return -1; + } } av_dlog(avctx, "qscale=%d\n", s->qscale); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
