From 36921fcdd3613dedd4046b59e3f43024fbfbbe17 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 14 Jul 2013 18:16:56 +0200 Subject: [PATCH] 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 (cherry picked from commit 5b2a29552ca09edd4646b6aa1828b32912b7ab36) Signed-off-by: Luca Barbato --- libavcodec/ivi_common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index c907e2a4d1..0dc7fa29f0 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -820,6 +820,14 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, } } } + } 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"); }