aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-08-12 22:43:33 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-08-16 00:55:34 +0200
commit7007dabec08f2f9f81661e71ef482dde394e17a8 (patch)
tree35555bae6fe03bbc06729f3fa9e82465e6afbfb9
parent2612431d1b2b442d9bf5bb639577ad2c506ae66e (diff)
downloadffmpeg-7007dabec08f2f9f81661e71ef482dde394e17a8.tar.gz
avcodec/shorten: Check verbatim length
Fixes: Timeout Fixes: 9252/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5780720709533696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/shorten.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 0f491090fd..9094d3fc55 100644
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -623,6 +623,11 @@ static int shorten_decode_frame(AVCodecContext *avctx, void *data,
switch (cmd) {
case FN_VERBATIM:
len = get_ur_golomb_shorten(&s->gb, VERBATIM_CKSIZE_SIZE);
+ if (len < 0 || len > get_bits_left(&s->gb)) {
+ av_log(avctx, AV_LOG_ERROR, "verbatim length %d invalid\n",
+ len);
+ return AVERROR_INVALIDDATA;
+ }
while (len--)
get_ur_golomb_shorten(&s->gb, VERBATIM_BYTE_SIZE);
break;