virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/pictordec: Error out if more than one plane is unused

Browse Source 
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 <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-09-12 02:48:04 +02:00
parent df91af140c
commit 470700bc96
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pictordec.c
View File

@ -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) { if (plane < s->nb_planes && x < avctx->width) {
int run = (y + 1) * avctx->width - x; int run = (y + 1) * avctx->width - x;
if (bits_per_plane == 8) if (bits_per_plane == 8)