diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-08 15:43:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-03-17 11:35:00 +0100 |
| commit | dd2a2a51fe47361fa82c67f2a417e1706713eaef (patch) | |
| tree | 4d849e0b5cc920789bc6aaa1f411d8797c3b6a96 /libavcodec/diracdec.c | |
| parent | efe4aef90fd8d4259aed0a6ffe317b5be6557da9 (diff) | |
| download | ffmpeg-streaming-dd2a2a51fe47361fa82c67f2a417e1706713eaef.zip ffmpeg-streaming-dd2a2a51fe47361fa82c67f2a417e1706713eaef.tar.gz | |
avcodec/diracdec: Count truncated parts as errors in decode_component()
Fixes: Timeout (29sec -> 4sec)
Fixes: 13150/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5690185671507968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/diracdec.c')
| -rw-r--r-- | libavcodec/diracdec.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 30b4bfa..a1e759f 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -685,7 +685,10 @@ static int decode_component(DiracContext *s, int comp) } align_get_bits(&s->gb); b->coeff_data = s->gb.buffer + get_bits_count(&s->gb)/8; - b->length = FFMIN(b->length, FFMAX(get_bits_left(&s->gb)/8, 0)); + if (b->length > FFMAX(get_bits_left(&s->gb)/8, 0)) { + b->length = FFMAX(get_bits_left(&s->gb)/8, 0); + damaged_count ++; + } skip_bits_long(&s->gb, b->length*8); } } |
