From: Luca Barbato <[email protected]>
There are 32 maximum decomposition levels, thus 33 resolution levels.
---
libavcodec/jpeg2kdec.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libavcodec/jpeg2kdec.c b/libavcodec/jpeg2kdec.c
index b4a7914..5df8a43 100644
--- a/libavcodec/jpeg2kdec.c
+++ b/libavcodec/jpeg2kdec.c
@@ -251,7 +251,12 @@ static int get_cox(Jpeg2KDecoderContext *s,
Jpeg2KCodingStyle *c)
if (s->buf_end - s->buf < 5)
return AVERROR(EINVAL);
- c->nreslevels = bytestream_get_byte(&s->buf) + 1; // num of resolution
levels - 1
+ /* nreslevels = number of resolution levels
+ = number of decomposition level +1 */
+ c->nreslevels = bytestream_get_byte(&s->buf) + 1;
+
+ if (c->nreslevels > JPEG2K_MAX_RESLEVELS)
+ return AVERROR_INVALIDDATA;
/* compute number of resolution levels to decode */
if (c->nreslevels < s->reduction_factor)
--
1.7.9.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
