diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-14 15:48:17 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-09-29 21:48:30 +0200 |
| commit | 7999ff8966e0d8cb2ad8229d7740b4b83741708f (patch) | |
| tree | f71f680f2aba68a3d95d160cb90bb7714f264054 /libavcodec/indeo5.c | |
| parent | a0b8f85f29883f538a32593bc3c6f712c972ff70 (diff) | |
| download | ffmpeg-7999ff8966e0d8cb2ad8229d7740b4b83741708f.tar.gz | |
indeo: Sanitize ff_ivi_init_planes fail paths
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 28dda8a691f1c723a4a9365ab85f9625f1330096)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/indeo5.c')
| -rw-r--r-- | libavcodec/indeo5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index c06d46da3e..f637e70f98 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -113,7 +113,7 @@ static int decode_gop_header(IVI45DecContext *ctx, AVCodecContext *avctx) } /* check if picture layout was changed and reallocate buffers */ - if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) { + if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf) || ctx->gop_invalid) { result = ff_ivi_init_planes(ctx->planes, &pic_conf); if (result < 0) { av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n"); @@ -314,9 +314,9 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) ctx->frame_num = get_bits(&ctx->gb, 8); if (ctx->frame_type == FRAMETYPE_INTRA) { - ctx->gop_invalid = 1; if ((ret = decode_gop_header(ctx, avctx)) < 0) { av_log(avctx, AV_LOG_ERROR, "Invalid GOP header, skipping frames.\n"); + ctx->gop_invalid = 1; return ret; } ctx->gop_invalid = 0; |