highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/jpeg2000dec: Check PLT data somewhat

Browse Source 
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 <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2019-04-16 15:30:50 +02:00
parent 6381b6f6a9
commit e627113329
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/jpeg2000dec.c
View File

@@ -832,15 +832,21 @@ static uint8_t get_tlm(Jpeg2000DecoderContext *s, int n)
static uint8_t get_plt(Jpeg2000DecoderContext *s, int n) static uint8_t get_plt(Jpeg2000DecoderContext *s, int n)
{ {
int i; int i;
int v;
av_log(s->avctx, AV_LOG_DEBUG, av_log(s->avctx, AV_LOG_DEBUG,
"PLT marker at pos 0x%X\n", bytestream2_tell(&s->g) - 4); "PLT marker at pos 0x%X\n", bytestream2_tell(&s->g) - 4);
if (n < 4)
return AVERROR_INVALIDDATA;
/*Zplt =*/ bytestream2_get_byte(&s->g); /*Zplt =*/ bytestream2_get_byte(&s->g);
for (i = 0; i < n - 3; i++) { 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; return 0;
} }