ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Sep 12 02:48:04 2018 +0200| [470700bc96c3817667653d87e81b06a3d9b832eb] | committer: Michael Niedermayer
avcodec/pictordec: Error out if more than one plane is unused Fixes: Timeout Fixes: 9797/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PICTOR_fuzzer-5664441659031552 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=470700bc96c3817667653d87e81b06a3d9b832eb --- libavcodec/pictordec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c index b29a484534..65d2d49060 100644 --- a/libavcodec/pictordec.c +++ b/libavcodec/pictordec.c @@ -236,6 +236,9 @@ static int decode_frame(AVCodecContext *avctx, } } + if (s->nb_planes - plane > 1) + return AVERROR_INVALIDDATA; + if (plane < s->nb_planes && x < avctx->width) { int run = (y + 1) * avctx->width - x; if (bits_per_plane == 8) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
