diff options
author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2011-09-12 11:39:53 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2011-09-12 15:51:30 +0200 |
commit | 23a1f0c59241465ba30103388029a7afc0ead909 (patch) | |
tree | 6937d736066035f29dc65e20f616a89cd69414bc /libavcodec | |
parent | 47a8589f7bc69d1a29da1dfdfbd0dfa78a9e31fd (diff) | |
download | ffmpeg-streaming-23a1f0c59241465ba30103388029a7afc0ead909.zip ffmpeg-streaming-23a1f0c59241465ba30103388029a7afc0ead909.tar.gz |
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 <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | 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; |