diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-02-07 15:49:09 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2017-10-12 21:20:05 +0200 |
| commit | eb3c1a94adbc28411610167d3dac583436e50125 (patch) | |
| tree | acb341df8797356793632ec18031b79a16fa12a7 | |
| parent | a37e84be69310cd7de9540c8bc194cb0a6d158ed (diff) | |
| download | ffmpeg-eb3c1a94adbc28411610167d3dac583436e50125.tar.gz | |
pictor: Correctly check frame dimensions
Fixes: 559/clusterfuzz-testcase-6424225917173760
Bug-Id: CVE-2017-7862
CC: libav-stable@libav.org
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8c2ea3030af7b40a3c4275696fb5c76cdb80950a)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
| -rw-r--r-- | libavcodec/pictordec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index 9477bc402d..49547cf310 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; |