diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 17:33:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 17:33:44 +0100 |
| commit | a5115752cad0fdda77ce07ecb0cbc05988a7f7c7 (patch) | |
| tree | d85214c5887f570874fa229835584896539f7960 /libavcodec/indeo4.c | |
| parent | cb297f6ae79bf9e31e9981122c4161effdd9b8a1 (diff) | |
| parent | cd9b0bb07a66d3299bd62922e9dfa742219abe79 (diff) | |
| download | ffmpeg-a5115752cad0fdda77ce07ecb0cbc05988a7f7c7.tar.gz | |
Merge commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79' into release/0.10
* commit 'cd9b0bb07a66d3299bd62922e9dfa742219abe79':
4xm: validate the buffer size before parsing it
indeo: Do not reference mismatched tiles
indeo: Sanitize ff_ivi_init_planes fail paths
Conflicts:
libavcodec/4xm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 02398c5750..9cbd493b5c 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -211,6 +211,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) if (ivi_pic_config_cmp(&pic_conf, &ctx->pic_conf)) { if (ff_ivi_init_planes(ctx->planes, &pic_conf)) { av_log(avctx, AV_LOG_ERROR, "Couldn't reallocate color planes!\n"); + ctx->pic_conf.luma_bands = 0; return AVERROR(ENOMEM); } |