From e627113329da7c7c21b00562515a1f11437716f3 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 16 Apr 2019 15:30:50 +0200 Subject: [PATCH] avcodec/jpeg2000dec: Check PLT data somewhat Fixes: Timeout (21sec -> 0.6sec) Fixes: 14134/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5768371078955008 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 9198cf87cb..62b0b1f9b7 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -832,15 +832,21 @@ static uint8_t get_tlm(Jpeg2000DecoderContext *s, int n) static uint8_t get_plt(Jpeg2000DecoderContext *s, int n) { int i; + int v; av_log(s->avctx, AV_LOG_DEBUG, "PLT marker at pos 0x%X\n", bytestream2_tell(&s->g) - 4); + if (n < 4) + return AVERROR_INVALIDDATA; + /*Zplt =*/ bytestream2_get_byte(&s->g); for (i = 0; i < n - 3; i++) { - bytestream2_get_byte(&s->g); + v = bytestream2_get_byte(&s->g); } + if (v & 0x80) + return AVERROR_INVALIDDATA; return 0; }