diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-24 17:43:55 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-09-29 09:26:30 +0200 |
| commit | 891918431db628db17885ed947ee387b29826a64 (patch) | |
| tree | 3a16b786f3101ed011c9e18fc1f1f5ecef3e8115 /libavcodec | |
| parent | c20a69630619d14ae92c5541d52c579d7c8f3e94 (diff) | |
| download | ffmpeg-891918431db628db17885ed947ee387b29826a64.tar.gz | |
indeo5dec: Make sure we have had a valid gop header.
This prevents decoding happening on a half initialized context.
Fixes CVE-2012-2779
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/indeo5.c | 8 | ||||
| -rw-r--r-- | libavcodec/ivi_common.c | 2 | ||||
| -rw-r--r-- | libavcodec/ivi_common.h | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 47437aecd4..4f8e0d8e96 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -304,8 +304,12 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) ctx->frame_num = get_bits(&ctx->gb, 8); if (ctx->frame_type == FRAMETYPE_INTRA) { - if (decode_gop_header(ctx, avctx)) - return -1; + ctx->gop_invalid = 1; + if (decode_gop_header(ctx, avctx)) { + av_log(avctx, AV_LOG_ERROR, "Invalid GOP header, skipping frames.\n"); + return AVERROR_INVALIDDATA; + } + ctx->gop_invalid = 0; } if (ctx->frame_type != FRAMETYPE_NULL) { diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 715a536d38..5ebbf56d3c 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -739,6 +739,8 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *data_size, "Error while decoding picture header: %d\n", result); return -1; } + if (ctx->gop_invalid) + return AVERROR_INVALIDDATA; if (ctx->gop_flags & IVI5_IS_PROTECTED) { av_log(avctx, AV_LOG_ERROR, "Password-protected clip!\n"); diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 1ba431b4ed..edbe96a1ee 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -248,6 +248,8 @@ typedef struct IVI45DecContext { int (*decode_mb_info) (struct IVI45DecContext *ctx, IVIBandDesc *band, IVITile *tile, AVCodecContext *avctx); void (*switch_buffers) (struct IVI45DecContext *ctx); int (*is_nonnull_frame)(struct IVI45DecContext *ctx); + + int gop_invalid; } IVI45DecContext; /** compare some properties of two pictures */ |