[FFmpeg-cvslog] avsdec: Set dimensions instead of relying on the demuxer.
Michael Niedermayer
git at videolan.org
Mon Feb 18 01:09:43 CET 2013
ffmpeg | branch: release/0.7 | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 20 17:42:18 2012 +0200| [7a0ff7566b66da0b75dfaaca4347c7b41970f0ef] | committer: Reinhard Tartler
avsdec: Set dimensions instead of relying on the demuxer.
The decode function assumes that the video will have those dimensions.
Fixes CVE-2012-2801
CC:libav-stable at libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 85f477935cd6b34e6ec2716b20e15ce748277a89)
Signed-off-by: Reinhard Tartler <siretart at tauware.de>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a0ff7566b66da0b75dfaaca4347c7b41970f0ef
---
libavcodec/avs.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index 3ad3d87..628a6e3 100644
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -158,6 +158,7 @@ avs_decode_frame(AVCodecContext * avctx,
static av_cold int avs_decode_init(AVCodecContext * avctx)
{
avctx->pix_fmt = PIX_FMT_PAL8;
+ avcodec_set_dimensions(avctx, 318, 198);
return 0;
}
More information about the ffmpeg-cvslog
mailing list