diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-01-01 20:43:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-01 12:49:26 +0200 |
| commit | ee671c0e80a08a6f901192884d7b5dca61c760d9 (patch) | |
| tree | e28fda6c7fe89ac8af84528e93b0bf48203e65da | |
| parent | bc752e53ebbee9d6bd65228c5b5bb1fe86eb6df9 (diff) | |
| download | ffmpeg-ee671c0e80a08a6f901192884d7b5dca61c760d9.tar.gz | |
avcodec/smacker: Check space before decoding type
Fixes: Timeout (232sec -> 280ms)
Fixes: 19682/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMACKER_fuzzer-5654129649385472
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 6f5c18da5977a3214e1ea30e6b0c0d9d858ce83d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/smacker.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 8503fee5ec..6e6aa34d29 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -384,6 +384,8 @@ static av_always_inline int smk_get_code(GetBitContext *gb, int *recode, int *la int v; while(*table & SMK_NODE) { + if (get_bits_left(gb) < 1) + return AVERROR_INVALIDDATA; if(get_bits1(gb)) table += (*table) & (~SMK_NODE); table++; @@ -448,6 +450,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, uint16_t pix; type = smk_get_code(&gb, smk->type_tbl, smk->type_last); + if (type < 0) + return type; run = block_runs[(type >> 2) & 0x3F]; switch(type & 3){ case SMK_BLK_MONO: |