diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-04 18:40:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 00:21:49 +0200 |
| commit | 142c65ba9ca65674f0227c70e82f3c9a2a0d16fe (patch) | |
| tree | 3829925e29d0c74654eb055b225bccce00811c3e | |
| parent | dfda395b2f0151568d5080c8e14a0df9edfa04aa (diff) | |
| download | ffmpeg-142c65ba9ca65674f0227c70e82f3c9a2a0d16fe.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 102551972e..c2359b8a4d 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; |