[FFmpeg-cvslog] indeo5: update AVCodecContext width/height on size change

[Michael Niedermayer]

ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 14 20:04:05 2012 +0200| [b6783b882682a95633b6db70ee80fffe61168256] | committer: Reinhard Tartler

indeo5: update AVCodecContext width/height on size change

Fixes CVE-2012-2787

Note that in 0.7, there is only indeo 5, no indeo 4 decoder

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit b146d74730ab9ec5abede9066f770ad851e45fbc)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>
(cherry picked from commit 2bc1e4fcb96c470e2ccb2a0a78a415d5eab960c8)

Conflicts:

	libavcodec/ivi_common.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6783b882682a95633b6db70ee80fffe61168256
---

 libavcodec/indeo5.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 45460a4..bdb53ca 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -798,6 +798,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         avctx->release_buffer(avctx, &ctx->frame);
 
     ctx->frame.reference = 0;
+    avcodec_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
     if (avctx->get_buffer(avctx, &ctx->frame) < 0) {
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;