diff mbox

[FFmpeg-devel,1/2] avcodec/bethsoftvideo: Check block_type

Message ID 20190225010447.6277-1-michael@niedermayer.cc
State Accepted
Commit b8ecadec0582a1521b5d0d253376966138e6ca78
Headers show

Commit Message

Michael Niedermayer Feb. 25, 2019, 1:04 a.m. UTC 
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>
---
 libavcodec/bethsoftvideo.c | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Michael Niedermayer March 3, 2019, 11:06 a.m. UTC | #1 
On Mon, Feb 25, 2019 at 02:04:46AM +0100, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/bethsoftvideo.c | 5 +++++
>  1 file changed, 5 insertions(+)

will apply patchset

[...]
diff mbox

Patch

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