diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-19 19:02:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-25 18:03:24 +0100 |
| commit | 286a33e42944919774c7386137ae0f546985c260 (patch) | |
| tree | f6c241b329fc848fe39a1eb04e76d1cd5c3fb0a1 /libavcodec | |
| parent | e4289cb253e29e4d62dc46759eb1a45d8f6d82df (diff) | |
| download | ffmpeg-286a33e42944919774c7386137ae0f546985c260.tar.gz | |
avcodec/wcmv: Copy/Init frame later
Speeds up error cases
Fixes: 13132/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664190616829952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/wcmv.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c index ebd5ef66f4..f03761b343 100644 --- a/libavcodec/wcmv.c +++ b/libavcodec/wcmv.c @@ -60,16 +60,6 @@ static int decode_frame(AVCodecContext *avctx, if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) return ret; - if (s->prev_frame->data[0]) { - ret = av_frame_copy(frame, s->prev_frame); - if (ret < 0) - return ret; - } else { - ptrdiff_t linesize[4] = { frame->linesize[0], 0, 0, 0 }; - av_image_fill_black(frame->data, linesize, avctx->pix_fmt, 0, - avctx->width, avctx->height); - } - blocks = bytestream2_get_le16(&gb); if (blocks > 5) { GetByteContext bgb; @@ -162,6 +152,16 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_seek(&gb, 2, SEEK_SET); } + if (s->prev_frame->data[0]) { + ret = av_frame_copy(frame, s->prev_frame); + if (ret < 0) + return ret; + } else { + ptrdiff_t linesize[4] = { frame->linesize[0], 0, 0, 0 }; + av_image_fill_black(frame->data, linesize, avctx->pix_fmt, 0, + avctx->width, avctx->height); + } + for (int block = 0; block < blocks; block++) { int x, y, w, h; |