Module: libav Branch: release/11 Commit: 20f895b6628ad87ba561ea18d37a03259416d64a
Author: Michael Niedermayer <[email protected]> Committer: Diego Biurrun <[email protected]> Date: Tue Feb 7 15:49:09 2017 +0100 pictor: Correctly check frame dimensions Fixes: 559/clusterfuzz-testcase-6424225917173760 Bug-Id: CVE-2017-7862 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 8c2ea3030af7b40a3c4275696fb5c76cdb80950a) Signed-off-by: Diego Biurrun <[email protected]> --- libavcodec/pictordec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 33c4545..9c6b4ee 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -140,7 +140,7 @@ static int decode_frame(AVCodecContext *avctx, avctx->pix_fmt = AV_PIX_FMT_PAL8; - if (s->width != avctx->width && s->height != avctx->height) { + if (s->width != avctx->width || s->height != avctx->height) { ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret; _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
