Module: libav Branch: release/0.8 Commit: d4f3abca6a76f322d0b8c5e90dd0368efdf58821
Author: Kostya Shishkov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Mon May 14 19:46:54 2012 +0200 indeo3: validate new frame size before resetting decoder (cherry picked from commit 6de226a2b8b703abc823f18c3fd7f39a0787aeb5) Signed-off-by: Reinhard Tartler <[email protected]> --- libavcodec/indeo3.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/libavcodec/indeo3.c b/libavcodec/indeo3.c index 55b4ec7..b7ef9e5 100644 --- a/libavcodec/indeo3.c +++ b/libavcodec/indeo3.c @@ -895,6 +895,14 @@ static int decode_frame_headers(Indeo3DecodeContext *ctx, AVCodecContext *avctx, av_dlog(avctx, "Frame dimensions changed!\n"); + if (width < 16 || width > 640 || + height < 16 || height > 480 || + width & 3 || height & 3) { + av_log(avctx, AV_LOG_ERROR, + "Invalid picture dimensions: %d x %d!\n", width, height); + return AVERROR_INVALIDDATA; + } + ctx->width = width; ctx->height = height; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
