diff mbox

[FFmpeg-devel] avcodec/wcmv: check remaining space vs. blocks

Message ID 20190601232532.16569-1-michael@niedermayer.cc
State Accepted
Commit dd8720045cdc46536c7a13f091aaf4ddea93e048
Headers show

Commit Message

Michael Niedermayer June 1, 2019, 11:25 p.m. UTC 
Fixes: Timeout (18sec  -> 7sec)
Fixes: 14835/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5646714897170432

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/wcmv.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer June 21, 2019, 2:40 p.m. UTC | #1 
On Sun, Jun 02, 2019 at 01:25:32AM +0200, Michael Niedermayer wrote:
> Fixes: Timeout (18sec  -> 7sec)
> Fixes: 14835/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5646714897170432
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/wcmv.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c
index 2988c15b23..0d60b9fe1f 100644
--- a/libavcodec/wcmv.c
+++ b/libavcodec/wcmv.c
@@ -154,6 +154,9 @@  static int decode_frame(AVCodecContext *avctx,
         bytestream2_seek(&gb, 2, SEEK_SET);
     }
 
+    if (bytestream2_get_bytes_left(&gb) < 8LL * blocks)
+        return AVERROR_INVALIDDATA;
+
     if (s->prev_frame->data[0]) {
         ret = av_frame_copy(frame, s->prev_frame);
         if (ret < 0)