[FFmpeg-cvslog] svq1dec: call avcodec_set_dimensions() after dimensions changed.

Michael Niedermayer git at videolan.org
Sun Dec 25 01:36:04 CET 2011


ffmpeg | branch: release/0.6 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 18 19:10:21 2011 +0100| [8ddc0b491d3c9c11c1e3d638fda51b4b604d32f4] | committer: Reinhard Tartler

svq1dec: call avcodec_set_dimensions() after dimensions changed.

Fixes NGS00148, CVE-2011-4579

Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

(cherry picked from commit 6e24b9488e67849a28e64a8056e05f83cf439229)

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

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

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

 libavcodec/svq1dec.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 2aa28ab..8c6f0c8 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -678,6 +678,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,
 #endif
     return result;
   }
+  avcodec_set_dimensions(avctx, s->width, s->height);
 
   //FIXME this avoids some confusion for "B frames" without 2 references
   //this should be removed after libavcodec can handle more flexible picture types & ordering



More information about the ffmpeg-cvslog mailing list