Module: libav Branch: release/9 Commit: 505415b98599777f8951d3d86821f542e661e581
Author: Luca Barbato <[email protected]> Committer: Luca Barbato <[email protected]> Date: Sun Jul 14 18:16:56 2013 +0200 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: [email protected] (cherry picked from commit 5b2a29552ca09edd4646b6aa1828b32912b7ab36) Signed-off-by: Luca Barbato <[email protected]> --- 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 36293a1..2a73754 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -953,6 +953,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"); } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
