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/ivi_common.c | |
| parent | c20a69630619d14ae92c5541d52c579d7c8f3e94 (diff) | |
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/ivi_common.c')
| -rw-r--r-- | libavcodec/ivi_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
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"); |