diff options
author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-14 18:16:56 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-15 11:46:50 +0200 |
commit | 5b2a29552ca09edd4646b6aa1828b32912b7ab36 (patch) | |
tree | 40b7c85037a37762252076c2e8be484a2f1e8a52 | |
parent | f9e5261cab067be7278f73d515bc9b601eb56202 (diff) | |
download | ffmpeg-5b2a29552ca09edd4646b6aa1828b32912b7ab36.tar.gz |
indeo: Reject impossible FRAMETYPE_NULL
A frame marked FRAMETYPE_NULL cannot be scalable and requires a
previous frame successfully decoded.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
-rw-r--r-- | libavcodec/ivi_common.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index de9ad5542c..25ca6b7568 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -958,6 +958,14 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } } } + } else { + if (ctx->is_scalable) + return AVERROR_INVALIDDATA; + + for (p = 0; p < 3; p++) { + if (!ctx->planes[p].bands[0].buf) + return AVERROR_INVALIDDATA; + } } //STOP_TIMER("decode_planes"); } |