diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-04-12 21:38:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-19 17:17:36 +0200 |
| commit | 896790530757d1dcd32b22777e45ff23912f9df4 (patch) | |
| tree | 9ac02fd75b975c5932106a875ba6857f66e2a8fc /libavcodec/cbs_jpeg_syntax_template.c | |
| parent | 33d17d1b539b408cdf9d5237c2f7924fd8a8b7d3 (diff) | |
| download | ffmpeg-896790530757d1dcd32b22777e45ff23912f9df4.tar.gz | |
avcodec/cbs_jpeg_syntax_template: Check table index before use in dht()
Fixes: out of array access
Fixes: 21515/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5766121576988672
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 d31862c2b1b1fd07dcdc503193056d6c9ad28ccb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/cbs_jpeg_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_jpeg_syntax_template.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/cbs_jpeg_syntax_template.c b/libavcodec/cbs_jpeg_syntax_template.c index d3cd9ff62e..1ffb77d231 100644 --- a/libavcodec/cbs_jpeg_syntax_template.c +++ b/libavcodec/cbs_jpeg_syntax_template.c @@ -108,6 +108,9 @@ static int FUNC(dht)(CodedBitstreamContext *ctx, RWContext *rw, n = 2; for (i = 0; n < current->Lh; i++) { + if (i >= 8) + return AVERROR_INVALIDDATA; + CHECK(FUNC(huffman_table)(ctx, rw, ¤t->table[i])); ++n; |