diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-15 23:40:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-01-06 11:30:44 +0100 |
| commit | f4bdb532fc5f06469701853931dbdaa7296b6d86 (patch) | |
| tree | 8df1feb6f5c7ffc05ec67ceaab0809bdd6187720 | |
| parent | 22e645c56a4998c3aee669c491a696691793887e (diff) | |
| download | ffmpeg-f4bdb532fc5f06469701853931dbdaa7296b6d86.tar.gz | |
avcodec/dstdec: Check read_table() for failure
Fixes: Timeout (too long -> 42sec)
Fixes: 18181/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DST_fuzzer-5736646250594304
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 03ea8d8cd45e55eeb9675c38184dc2149710a557)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dstdec.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 10b89c3c1b..51ca810c05 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -298,11 +298,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, /* Filter Coef Sets (10.12) */ - read_table(gb, &s->fsets, fsets_code_pred_coeff, 7, 9, 1, 0); + ret = read_table(gb, &s->fsets, fsets_code_pred_coeff, 7, 9, 1, 0); + if (ret < 0) + return ret; /* Probability Tables (10.13) */ - read_table(gb, &s->probs, probs_code_pred_coeff, 6, 7, 0, 1); + ret = read_table(gb, &s->probs, probs_code_pred_coeff, 6, 7, 0, 1); + if (ret < 0) + return ret; /* Arithmetic Coded Data (10.11) */ |