diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-04 18:40:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-16 16:00:22 +0200 |
| commit | 55d8fd38d66e8e43eff94beda9a250f659a731fd (patch) | |
| tree | db864e5e83867b2ccfc83c2ad0309719a19dfb5b | |
| parent | d4f008557ae7f030023ee1366e85aa08f1dcfb14 (diff) | |
| download | ffmpeg-55d8fd38d66e8e43eff94beda9a250f659a731fd.tar.gz | |
avcodec/pngdec: Use ff_set_dimensions()
Fixes OOM
Fixes: 1314/clusterfuzz-testcase-minimized-4621997222920192
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 a0296fc056f0d86943c697c505a181744b07dd45)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pngdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index c72f34f961..52b872a06a 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -611,8 +611,9 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, } if (!(s->state & PNG_IDAT)) { /* init image info */ - avctx->width = s->width; - avctx->height = s->height; + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; s->channels = ff_png_get_nb_channels(s->color_type); s->bits_per_pixel = s->bit_depth * s->channels; |