diff mbox series

[FFmpeg-devel,4/4] avcodec/jpeg2000dec: Check that atom header is within bytsetream

Message ID 20210905192418.25970-4-michael@niedermayer.cc
State Accepted
Commit 3c659f861856d751fe3aa1358b1cccff3117f948
Headers show
Series [FFmpeg-devel,1/4] avformat/mxfdec: check channel number in mxf_get_d10_aes3_packet() | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Michael Niedermayer Sept. 5, 2021, 7:24 p.m. UTC 
Fixes: Infinite loop
Fixes: 36666/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5912760671141888

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/jpeg2000dec.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Paul B Mahol Sept. 5, 2021, 7:27 p.m. UTC | #1 
lgtm
Michael Niedermayer Sept. 5, 2021, 8:25 p.m. UTC | #2 
On Sun, Sep 05, 2021 at 09:27:08PM +0200, Paul B Mahol wrote:
> lgtm

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index e62f7b19e6..c95f22bc90 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -2360,6 +2360,8 @@  static int jp2_find_codestream(Jpeg2000DecoderContext *s)
                    atom_size >= 16) {
             uint32_t atom2_size, atom2, atom2_end;
             do {
+                if (bytestream2_get_bytes_left(&s->g) < 8)
+                    break;
                 atom2_size = bytestream2_get_be32u(&s->g);
                 atom2      = bytestream2_get_be32u(&s->g);
                 atom2_end  = bytestream2_tell(&s->g) + atom2_size - 8;