aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-18 19:10:21 +0100
committerReinhard Tartler <siretart@tauware.de>2011-12-23 15:42:24 +0100
commit6e24b9488e67849a28e64a8056e05f83cf439229 (patch)
tree2489714c19e8b51cf84bdafa1b826e59c7d65cb6
parentbe00d2e1744d5e7853d8d4ebfc109780036db0f8 (diff)
downloadffmpeg-6e24b9488e67849a28e64a8056e05f83cf439229.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>
-rw-r--r--libavcodec/svq1dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 7eb6e607d1..69dbd1b25d 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -659,6 +659,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