diff mbox series

[FFmpeg-devel,1/2] avcodec/cbs_jpeg_syntax_template: Check table index before use in dht()

Message ID 20200412221534.22269-1-michael@niedermayer.cc
State Accepted
Commit d31862c2b1b1fd07dcdc503193056d6c9ad28ccb
Headers show
Series [FFmpeg-devel,1/2] avcodec/cbs_jpeg_syntax_template: Check table index before use in dht() | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Michael Niedermayer April 12, 2020, 10:15 p.m. UTC 
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>
---
 libavcodec/cbs_jpeg_syntax_template.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer April 15, 2020, 4:50 p.m. UTC | #1 
On Mon, Apr 13, 2020 at 12:15:33AM +0200, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/cbs_jpeg_syntax_template.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply patchset

[...]
diff mbox series

Patch

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, &current->table[i]));
 
         ++n;