]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/jpeg2000dec: clear pointer which become stale in get_ppt()
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 31 May 2020 10:49:50 +0000 (12:49 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 1 Jun 2020 21:32:28 +0000 (23:32 +0200)
Fixes: use after free
Fixes: 22484/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5671488765296640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Gautam Ramakrishnan <gautamramk@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/jpeg2000dec.c

index 65555424ed5baaa506172a635778eed55f7bd65e..b7766459c407df60fc0373ecb192204a71ac0382 100644 (file)
@@ -928,6 +928,7 @@ static int get_ppt(Jpeg2000DecoderContext *s, int n)
         tile->packed_headers = new;
     } else
         return AVERROR(ENOMEM);
+    memset(&tile->packed_headers_stream, 0, sizeof(tile->packed_headers_stream));
     memcpy(tile->packed_headers + tile->packed_headers_size,
            s->g.buffer, n - 3);
     tile->packed_headers_size += n - 3;