RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/pictordec: Only recalculate d when y changes in picmemset() 

Fixes: Timeout (21->18sec)
Fixes: 14124/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PICTOR_fuzzer-5633887734071296

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 2019-04-13 01:19:03 +02:00
parent 3ed360ea5c
commit 838710bd6c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pictordec.c
View File

@ -68,10 +68,10 @@ static void picmemset(PicContext *s, AVFrame *frame, unsigned value, int run,
int planel = *plane;
value <<= shift;
d = frame->data[0] + yl * frame->linesize[0];
while (run > 0) {
int j;
for (j = 8-bits_per_plane; j >= 0; j -= bits_per_plane) {
d = frame->data[0] + yl * frame->linesize[0];
d[xl] |= (value >> j) & mask;
xl += 1;
if (xl == s->width) {
@ -85,6 +85,7 @@ static void picmemset(PicContext *s, AVFrame *frame, unsigned value, int run,
value <<= bits_per_plane;
mask <<= bits_per_plane;
}
d = frame->data[0] + yl * frame->linesize[0];
}
}
run--;