Le 24/06/2013 17:14, Luca Barbato a écrit :
From: Michael Niedermayer <[email protected]>
Avoid overread.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <[email protected]>
---
libavcodec/jpeg2kdec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/jpeg2kdec.c b/libavcodec/jpeg2kdec.c
index cd9086e..a5aaef5 100644
--- a/libavcodec/jpeg2kdec.c
+++ b/libavcodec/jpeg2kdec.c
@@ -1236,9 +1236,10 @@ static int jpeg2k_read_main_headers(Jpeg2KDecoderContext
*s)
if (marker == JPEG2K_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 JPEG2K_SIZ:
ret = get_siz(s);
LGTM
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
