summaryrefslogtreecommitdiff
path: root/libavcodec/ivi_common.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-24 17:43:55 +0100
committerAnton Khirnov <anton@khirnov.net>2012-09-29 09:26:30 +0200
commit891918431db628db17885ed947ee387b29826a64 (patch)
tree3a16b786f3101ed011c9e18fc1f1f5ecef3e8115 /libavcodec/ivi_common.h
parentc20a69630619d14ae92c5541d52c579d7c8f3e94 (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.h')
-rw-r--r--libavcodec/ivi_common.h2
1 files changed, 2 insertions, 0 deletions
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 */