diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-04-12 22:06:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-19 17:17:36 +0200 |
| commit | ed1c60d06bbecc54d85cad695fa83cb7ab2b7161 (patch) | |
| tree | f1a014788e8b9633629263de6a62365e2f21bfe8 /libavcodec/cbs_jpeg_syntax_template.c | |
| parent | 896790530757d1dcd32b22777e45ff23912f9df4 (diff) | |
| download | ffmpeg-ed1c60d06bbecc54d85cad695fa83cb7ab2b7161.tar.gz | |
avcodec/cbs_jpeg_syntax_template: Check array index in huffman_table()
Fixes: index 224 out of bounds for type 'uint8_t [224]'
Fixes: 21534/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-6291612167831552
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 18f5256c0dc6cfb41e649ab80b0577ba33852d76)
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/cbs_jpeg_syntax_template.c b/libavcodec/cbs_jpeg_syntax_template.c index 1ffb77d231..6eda56d623 100644 --- a/libavcodec/cbs_jpeg_syntax_template.c +++ b/libavcodec/cbs_jpeg_syntax_template.c @@ -89,6 +89,8 @@ static int FUNC(huffman_table)(CodedBitstreamContext *ctx, RWContext *rw, ij = 0; for (i = 0; i < 16; i++) { for (j = 0; j < current->L[i]; j++) { + if (ij >= 224) + return AVERROR_INVALIDDATA; us(8, V[ij], ij, 0, 255); ++ij; } |