diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-05-17 22:27:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-04 13:06:41 +0200 |
| commit | 89836ad5a7a80a353ae3710a00d9708fc6437464 (patch) | |
| tree | 1d9a3ce20bf72f526f27a844ff075437772e8465 | |
| parent | cf3156e762bbd3fbaf9da53f3ef1ea6d1bad2ec5 (diff) | |
| download | ffmpeg-streaming-89836ad5a7a80a353ae3710a00d9708fc6437464.zip ffmpeg-streaming-89836ad5a7a80a353ae3710a00d9708fc6437464.tar.gz | |
avcodec/pafvideo: Clear frame buffer later
This way the clearing can be skipped in case of some errors.
Fixes: Timeout (11sec -> 344ms)
Fixes: 14670/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PAF_VIDEO_fuzzer-5769534503387136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/pafvideo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c index 7bfd681..323c662 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -293,9 +293,6 @@ static int paf_video_decode(AVCodecContext *avctx, void *data, return ret; if (code & 0x20) { // frame is keyframe - for (i = 0; i < 4; i++) - memset(c->frame[i], 0, c->frame_size); - memset(c->pic->data[1], 0, AVPALETTE_SIZE); c->current_frame = 0; c->pic->key_frame = 1; @@ -332,6 +329,10 @@ static int paf_video_decode(AVCodecContext *avctx, void *data, c->pic->palette_has_changed = 1; } + if (code & 0x20) + for (i = 0; i < 4; i++) + memset(c->frame[i], 0, c->frame_size); + switch (code & 0x0F) { case 0: /* Block-based motion compensation using 4x4 blocks with either |
