diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2019-02-25 01:39:44 +0300 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-14 02:24:44 +0300 |
commit | 09683e1f4e215be41afa189c0dd67902a61b70fb (patch) | |
tree | b04be118ea4f73721ea1ad69092c96df4d056d86 /libavcodec/bethsoftvideo.c | |
parent | 662b6351c80a7768a5b46943a067b7c633e29088 (diff) |
avcodec/bethsoftvideo: Check block_type
Fixes: Timeout (17 seconds -> 1 second)
Fixes: 13184/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BETHSOFTVID_fuzzer-5711446296494080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b8ecadec0582a1521b5d0d253376966138e6ca78)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/bethsoftvideo.c')
-rw-r--r-- | libavcodec/bethsoftvideo.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index 274516bf4d..e5a73f55a1 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -109,6 +109,11 @@ static int bethsoftvid_decode_frame(AVCodecContext *avctx, if(yoffset >= avctx->height) return AVERROR_INVALIDDATA; dst += vid->frame->linesize[0] * yoffset; + case VIDEO_P_FRAME: + case VIDEO_I_FRAME: + break; + default: + return AVERROR_INVALIDDATA; } // main code |