Module: libav Branch: release/0.8 Commit: b1ad5a21da7ac56b853b6a21ed08a075ecbb89c6
Author: Janne Grunau <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Mar 23 22:30:38 2012 +0100 rv34: error out on size changes with frame threading Fixes CVE-2012-2772 (cherry picked from commit cb7190cd2c691fd93e4d3664f3fce6c19ee001dd) Signed-off-by: Anton Khirnov <[email protected]> --- libavcodec/rv34.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 859ea50..c05b71b 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1677,6 +1677,13 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, if (s->width != si.width || s->height != si.height) { int err; + if (HAVE_THREADS && + (s->avctx->active_thread_type & FF_THREAD_FRAME)) { + av_log_missing_feature(s->avctx, "Width/height changing with " + "frame threading is", 0); + return AVERROR_PATCHWELCOME; + } + av_log(s->avctx, AV_LOG_WARNING, "Changing dimensions to %dx%d\n", si.width, si.height); MPV_common_end(s); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
