mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
avcodec/jpeg2000dec: check len before parsing header
Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
5deb96c564
commit
69e4d8e6a4
@ -1249,9 +1249,9 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s)
|
||||
if (marker == JPEG2000_EOC)
|
||||
break;
|
||||
|
||||
if (bytestream2_get_bytes_left(&s->g) < 2)
|
||||
len = bytestream2_get_be16(&s->g);
|
||||
if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2)
|
||||
return AVERROR(EINVAL);
|
||||
len = bytestream2_get_be16u(&s->g);
|
||||
switch (marker) {
|
||||
case JPEG2000_SIZ:
|
||||
ret = get_siz(s);
|
||||
|
Loading…
Reference in New Issue
Block a user