From: Michael Niedermayer <[email protected]> Avoid overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/jpeg2000dec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 08476d1..815ae3e 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1265,9 +1265,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) if (marker == JPEG2000_EOC) break; - if (bytestream2_get_bytes_left(&s->g) < 2) - return AVERROR_INVALIDDATA; len = bytestream2_get_be16u(&s->g); + if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2) + return AVERROR_INVALIDDATA; + switch (marker) { case JPEG2000_SIZ: ret = get_siz(s); -- 1.8.2.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
