aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/indeo5.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-07-14 15:48:17 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-07-15 11:29:59 +0200
commit28dda8a691f1c723a4a9365ab85f9625f1330096 (patch)
treea2f2cb8b7e1d71aacada978267db1a95fb718d70 /libavcodec/indeo5.c
parentb0eeb9d442e4b7e82f6797d74245434ea33110a5 (diff)
downloadffmpeg-28dda8a691f1c723a4a9365ab85f9625f1330096.tar.gz
indeo: Sanitize ff_ivi_init_planes fail paths
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/indeo5.c')
-rw-r--r--libavcodec/indeo5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index cedf647305..481a4a61e2 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;