highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/scpr: Skip frames which change nothing

Browse Source 
Fixes: Timeout
Fixes: 10292/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5687943864254464

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-25 02:36:35 +02:00
parent a8a98ba9ee
commit d702769213
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/scpr.c
View File

@@ -516,7 +516,7 @@ static int decompress_p(AVCodecContext *avctx,
int backstep = linesize - avctx->width; int backstep = linesize - avctx->width;
if (bytestream2_get_byte(gb) == 0) if (bytestream2_get_byte(gb) == 0)
return 0; return 1;
bytestream2_skip(gb, 1); bytestream2_skip(gb, 1);
init_rangecoder(&s->rc, gb); init_rangecoder(&s->rc, gb);
@@ -813,6 +813,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
s->current_frame->linesize[0] / 4, s->current_frame->linesize[0] / 4,
(uint32_t *)s->last_frame->data[0], (uint32_t *)s->last_frame->data[0],
s->last_frame->linesize[0] / 4); s->last_frame->linesize[0] / 4);
if (ret == 1)
return avpkt->size;
} else { } else {
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }