Module: libav Branch: master Commit: 23a1f0c59241465ba30103388029a7afc0ead909
Author: Kostya Shishkov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Mon Sep 12 11:39:53 2011 +0200 rv34: check that subsequent slices have the same type as first one. This prevents some crashes when corrupted bitstream reports e.g. P-type slice in I-frame. Official RealVideo decoder demands all slices to be of the same type too. Signed-off-by: Anton Khirnov <[email protected]> --- libavcodec/rv34.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 253c395..80c88fb 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1336,6 +1336,13 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int } } s->mb_x = s->mb_y = 0; + } else { + int slice_type = r->si.type ? r->si.type : AV_PICTURE_TYPE_I; + + if (slice_type != s->pict_type) { + av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n"); + return AVERROR_INVALIDDATA; + } } r->si.end = end; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
