diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-15 23:42:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:47 +0100 |
| commit | 3de0c702bdf13ef4fa14840c6060cf70d15716b4 (patch) | |
| tree | bb89288bcf74cf26820e59a1aeee951a5a860117 | |
| parent | 2258982c8bfc99a6751bd1dc76891bbf3a01fc75 (diff) | |
| download | ffmpeg-3de0c702bdf13ef4fa14840c6060cf70d15716b4.tar.gz | |
avcodec/dstdec: Check that AC probabilities are within range
ISO/IEC 14496-3:2005(E): "Each entry of P_one[ ][ ] is in the range of 1 to
128, corresponding to a probability of 1/256 to 128/256 of the next error bit (bit E, See Figure 10.5)..."
Fixes: Timeout (42sec ->1sec)
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 0c3e1b395b47fac44397604b2a3343c4bd92561c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dstdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/dstdec.c b/libavcodec/dstdec.c index 51ca810c05..daf906ba0c 100644 --- a/libavcodec/dstdec.c +++ b/libavcodec/dstdec.c @@ -161,6 +161,10 @@ static int read_table(GetBitContext *gb, Table *t, const int8_t code_pred_coeff[ c -= (x + 4) / 8; else c += (-x + 3) / 8; + if (!is_signed) { + if (c < offset || c >= offset + (1<<coeff_bits)) + return AVERROR_INVALIDDATA; + } t->coeff[i][j] = c; } } |