avcodec/vb: Check input packet size to be large enough to contain flags
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 11 Aug 2019 22:21:49 +0000 (00:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 29 Aug 2019 13:18:42 +0000 (15:18 +0200)
Fixes: Timeout (->9sec)
Fixes: 16292/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VB_fuzzer-5747063496638464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/vb.c

index c6dd6fb..d9c6b93 100644 (file)
@@ -199,6 +199,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     uint32_t size;
     int offset = 0;
 
+    if (avpkt->size < 2)
+        return AVERROR_INVALIDDATA;
+
     bytestream2_init(&c->stream, avpkt->data, avpkt->size);
 
     if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)