aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-08-12 00:21:49 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-06 20:30:57 +0100
commitc4981bcf07b26110658de040dffc76b0821ad743 (patch)
treea24e59faecf3c657fc0513f6a9401d508c6cb7b9
parent9a46d72235801aebe020b69b0554b601515b8003 (diff)
downloadffmpeg-c4981bcf07b26110658de040dffc76b0821ad743.tar.gz
avcodec/vb: Check input packet size to be large enough to contain flags
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> (cherry picked from commit dea2591d4fbc989ca82bc8a8ad7d16aacdc89af1) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/vb.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vb.c b/libavcodec/vb.c
index c6dd6fb456..d9c6b93a73 100644
--- a/libavcodec/vb.c
+++ b/libavcodec/vb.c
@@ -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)