diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-18 19:10:21 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-12-23 15:55:38 +0100 |
| commit | 0eca0da06e40b73af495cc05fbcfaa030fcf78ea (patch) | |
| tree | ad4a029a0f2091fa7e2f5327564c556688ac14e3 | |
| parent | 38a511e84cb776ec16cb7edcf8ed5e878af0a374 (diff) | |
| download | ffmpeg-0eca0da06e40b73af495cc05fbcfaa030fcf78ea.tar.gz | |
svq1dec: call avcodec_set_dimensions() after dimensions changed.
Fixes NGS00148, CVE-2011-4579
Found-by: Phillip Langlois
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6e24b9488e67849a28e64a8056e05f83cf439229)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/svq1dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 2a80374569..325cc1289b 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -658,6 +658,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, av_dlog(s->avctx, "Error in svq1_decode_frame_header %i\n",result); 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 |