summaryrefslogtreecommitdiff
path: root/libavcodec/pngdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-04 18:40:46 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-04 18:41:30 +0200
commita0296fc056f0d86943c697c505a181744b07dd45 (patch)
tree8bfedf6bce2c6157ed89d00e4072b1a509c06123 /libavcodec/pngdec.c
parentcabfed6895fcc679cd6a6244a12d800e0f3f2d20 (diff)
downloadffmpeg-a0296fc056f0d86943c697c505a181744b07dd45.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>
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r--libavcodec/pngdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index aece1fcd5f..083f61f4f8 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -622,8 +622,9 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s,
}
if (!(s->pic_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;