Browse Source
avcodec/jpeg2000dec: Fixes invalid shifts in jpeg2000_decode_packets_po_iteration()
Fixes: shift exponent 47 is too large for 32-bit type 'int' Fixes: 9163/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5661750182543360 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>tags/n4.1
Michael Niedermayer
7 years ago
1 changed files with 4 additions and 4 deletions
Unified View
Diff Options
-
+4 -4libavcodec/jpeg2000dec.c
+ 4
- 4
libavcodec/jpeg2000dec.c
View File
| @@ -1254,10 +1254,10 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 | |||||
| if (reslevelno >= codsty->nreslevels) | if (reslevelno >= codsty->nreslevels) | ||||
| continue; | continue; | ||||
| if (yc % (1 << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check | |||||
| if (yc % (1LL << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check | |||||
| continue; | continue; | ||||
| if (xc % (1 << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check | |||||
| if (xc % (1LL << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check | |||||
| continue; | continue; | ||||
| // check if a precinct exists | // check if a precinct exists | ||||
| @@ -1325,10 +1325,10 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 | |||||
| uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; // ==> N_L - r | uint8_t reducedresno = codsty->nreslevels - 1 -reslevelno; // ==> N_L - r | ||||
| Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno; | Jpeg2000ResLevel *rlevel = comp->reslevel + reslevelno; | ||||
| if (yc % (1 << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check | |||||
| if (yc % (1LL << (rlevel->log2_prec_height + reducedresno)) && y != tile->coord[1][0]) //FIXME this is a subset of the check | |||||
| continue; | continue; | ||||
| if (xc % (1 << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check | |||||
| if (xc % (1LL << (rlevel->log2_prec_width + reducedresno)) && x != tile->coord[0][0]) //FIXME this is a subset of the check | |||||
| continue; | continue; | ||||
| // check if a precinct exists | // check if a precinct exists | ||||