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

avcodec/scpr: Perform frame copy later 

Optimization found while looking at 13442/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5758293933293568

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-03-14 21:23:03 +01:00
parent 21b90435d6
commit 8f63fa4c2e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/scpr.c
View File

@ -409,6 +409,10 @@ static int decompress_p(AVCodecContext *avctx,
}
}
ret = av_frame_copy(s->current_frame, s->last_frame);
if (ret < 0)
return ret;
for (y = 0; y < s->nby; y++) {
for (x = 0; x < s->nbx; x++) {
int sy1 = 0, sy2 = 16, sx1 = 0, sx2 = 16;
@ -549,10 +553,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
} else if (type == 0 || type == 1) {
frame->key_frame = 0;
ret = av_frame_copy(s->current_frame, s->last_frame);
if (ret < 0)
return ret;
if (s->version == 1 || s->version == 2)
ret = decompress_p(avctx, (uint32_t *)s->current_frame->data[0],
s->current_frame->linesize[0] / 4,

4
libavcodec/scpr3.c
View File

@ -1081,6 +1081,10 @@ static int decompress_p3(AVCodecContext *avctx,
}
}
ret = av_frame_copy(s->current_frame, s->last_frame);
if (ret < 0)
return ret;
for (y = 0; y < s->nby; y++) {
for (x = 0; x < s->nbx; x++) {
int sy1 = 0, sy2 = 16, sx1 = 0, sx2 = 16;