mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/jpeglsdec: Check Jpeg-LS LSE
Fixes: signed integer overflow: 2147478526 + 33924 cannot be represented in type 'int'
Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int'
Fixes: 64243/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5195717848989696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c72a20f01a
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
033d431f15
commit
3044269ae8
|
@ -376,6 +376,19 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near,
|
|||
state->T3 = s->t3;
|
||||
state->reset = s->reset;
|
||||
ff_jpegls_reset_coding_parameters(state, 0);
|
||||
|
||||
/* Testing parameters here, we cannot test in LSE or SOF because
|
||||
* these interdepend and are allowed in either order
|
||||
*/
|
||||
if (state->maxval >= (1<<state->bpp) ||
|
||||
state->T1 > state->T2 ||
|
||||
state->T2 > state->T3 ||
|
||||
state->T3 > state->maxval ||
|
||||
state->reset > FFMAX(255, state->maxval)) {
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
goto end;
|
||||
}
|
||||
|
||||
ff_jpegls_init_state(state);
|
||||
|
||||
if (s->bits <= 8)
|
||||
|
|
Loading…
Reference in New Issue